Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e21e2a2d authored by Behdad Esfahbod's avatar Behdad Esfahbod Committed by Raph Levien
Browse files

Clean up Minikin includes 

Include headers where they are used.  Add header guards to MinikinSkia.h

Change-Id: If341231625348290d28a7d625561fffc171a8407
parent 29762c3d

core/jni/android/graphics/MinikinSkia.cpp

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#define LOG_TAG "Minikin"

#include <cutils/log.h>



#include <minikin/MinikinFont.h>

#include "MinikinSkia.h"



namespace android {

core/jni/android/graphics/MinikinSkia.h

+8 −1
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@ 
 * limitations under the License.

 */



#ifndef ANDROID_MINIKIN_SKIA_H

#define ANDROID_MINIKIN_SKIA_H



#include <minikin/MinikinFont.h>



namespace android {



class MinikinFontSkia : public MinikinFont {
@@ -48,3 +53,5 @@ private: 
};



}  // namespace android



#endif  // ANDROID_MINIKIN_SKIA_H
 
 No newline at end of file

core/jni/android/graphics/MinikinUtils.cpp

+0 −2
Original line number Diff line number Diff line
@@ -19,10 +19,8 @@ 
#include <string>



#include "SkPathMeasure.h"

#include "minikin/Layout.h"

#include "Paint.h"

#include "TypefaceImpl.h"

#include "MinikinSkia.h"



#include "MinikinUtils.h"

core/jni/android/graphics/MinikinUtils.h

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,10 @@ 
#ifndef ANDROID_MINIKIN_UTILS_H

#define ANDROID_MINIKIN_UTILS_H



#include <minikin/Layout.h>

#include "Paint.h"

#include "MinikinSkia.h"

#include "TypefaceImpl.h"



namespace android {
@@ -40,9 +43,6 @@ enum { 
    kBidi_Mask = 0x7

};



class Layout;

class TypefaceImpl;



class MinikinUtils {

public:

    static void doLayout(Layout* layout, const Paint* paint, int bidiFlags, TypefaceImpl* typeface,

core/jni/android/graphics/Paint.cpp

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include "utils/Blur.h"



#include <minikin/GraphemeBreak.h>

#include <minikin/Layout.h>

#include "MinikinSkia.h"

#include "MinikinUtils.h"

#include "Paint.h"