commit e2dc2d7f2acec9dc1e1d577a14b3f6e8efd3be71
author Chris Craik <ccraik@google.com> Fri Apr 12 15:22:24 2013 -0700
committer Chris Craik <ccraik@google.com> Fri Apr 12 15:27:26 2013 -0700
tree 34ce9c3f0dda59d3833a73af705888b85f61c228
parent e05129fc0eb58baa033b4d309cc2db03e262ee9e

Fix skia generation counting in getFontMetrics

bug:8598158

The generationID should be saved first thing, before the paint is modified

Change-Id: I0709788554dc1c1d3fd8e8e71791aba4eb22d562

src/core/SkPaint.cpp

diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index d2d1b7f..57930eb 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -934,12 +934,12 @@
 public:
     SkAutoRestorePaintTextSizeAndFrame(const SkPaint* paint)
             : fPaint((SkPaint*)paint) {
-        fTextSize = paint->getTextSize();
-        fStyle = paint->getStyle();
-        fPaint->setStyle(SkPaint::kFill_Style);
 #ifdef SK_BUILD_FOR_ANDROID
         fGenerationID = fPaint->getGenerationID();
 #endif
+        fTextSize = paint->getTextSize();
+        fStyle = paint->getStyle();
+        fPaint->setStyle(SkPaint::kFill_Style);
     }
 
     ~SkAutoRestorePaintTextSizeAndFrame() {