Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(266)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: include/core/SkPaint.h

Issue 12699002: Upstream changes from Android. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« include/core/SkBitmap.h ('K') | « include/core/SkBitmap.h ('k') | include/core/SkRRect.h » ('j') | include/core/SkRRect.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkPaint.h
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 35ce3e60c444eea94d84ee94d44edcf305c28af0..36fb737d0425da9954557d244bf1cd8f2a4f6f62 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -850,11 +850,12 @@ public:
const SkPoint pos[], SkPath* path) const;
#ifdef SK_BUILD_FOR_ANDROID
- const SkGlyph& getUnicharMetrics(SkUnichar);
- const SkGlyph& getGlyphMetrics(uint16_t);
- const void* findImage(const SkGlyph&);
+ const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*);
+ const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*);
+ const void* findImage(const SkGlyph&, const SkMatrix*);
uint32_t getGenerationID() const;
+ void setGenerationID(uint32_t generationID);
/** Returns the base glyph count for the strike associated with this paint
*/
« include/core/SkBitmap.h ('K') | « include/core/SkBitmap.h ('k') | include/core/SkRRect.h » ('j') | include/core/SkRRect.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698