Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / gpu / GrBitmapTextContext.h

diff --git a/src/third_party/skia/src/gpu/GrBitmapTextContext.h b/src/third_party/skia/src/gpu/GrBitmapTextContext.h
index 836cc76..6d4ea6d 100644 (file)
--- a/src/third_party/skia/src/gpu/GrBitmapTextContext.h
+++ b/src/third_party/skia/src/gpu/GrBitmapTextContext.h
@@ -11,7 +11,6 @@
 #include "GrTextContext.h"
 
 class GrTextStrike;
-class GrAtlasMgr;
 
 /*
  * This class implements GrTextContext using standard bitmap fonts
@@ -48,8 +47,9 @@ private:
     void*                       fVertices;
     int32_t                     fMaxVertices;
     GrTexture*                  fCurrTexture;
-    SkAutoTUnref<GrEffectRef>   fCachedEffect;
-    uint32_t                    fEffectTextureGenID;
+    SkAutoTUnref<GrEffect>      fCachedEffect;
+    // Used to check whether fCachedEffect is still valid.
+    uint32_t                    fEffectTextureUniqueID;
     int                         fCurrVertex;
     SkRect                      fVertexBounds;
 };