commit f5dbe2f00f853c6a1719924bdd0c33335a53423a
author djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Apr 15 13:41:26 2011 +0000
committer djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Apr 15 13:41:26 2011 +0000
tree 4244625eb50b4615a8f9016ee17ae2afb09e57f3
parent 61eb040e2f18d367c66c0bfc08d2707dc75f7cf2

Upstream android changes.

reviewed by: reed


git-svn-id: http://skia.googlecode.com/svn/trunk@1134 2bbb7eff-a529-9590-31e7-b0007b416f81

include/core/SkPaint.h

diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index a931ccd..f4b325f 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -89,9 +89,7 @@
         return static_cast<Hinting>(fHinting);
     }
 
-    void setHinting(Hinting hintingLevel) {
-        fHinting = hintingLevel;
-    }
+    void setHinting(Hinting hintingLevel);
 
     /** Specifies the bit values that are stored in the paint's flags.
     */
@@ -817,6 +815,13 @@
     void getTextPath(const void* text, size_t length, SkScalar x, SkScalar y,
                      SkPath* path) const;
 
+#ifdef ANDROID
+    const SkGlyph& getUnicharMetrics(SkUnichar);
+    const void* findImage(const SkGlyph&);
+
+    uint32_t getGenerationID() const;
+#endif
+
 private:
     SkTypeface*     fTypeface;
     SkScalar        fTextSize;
@@ -841,6 +846,9 @@
     unsigned        fStyle : 2;
     unsigned        fTextEncoding : 2;  // 3 values
     unsigned        fHinting : 2;
+#ifdef ANDROID
+    uint32_t        fGenerationID;
+#endif
 
     SkDrawCacheProc    getDrawCacheProc() const;
     SkMeasureCacheProc getMeasureCacheProc(TextBufferDirection dir,