X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2Fskia%2Fsrc%2Fgpu%2FGrBitmapTextContext.h;h=6d4ea6d524e255d57e802bbb5c52502c12642625;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=836cc76a0dd69c68c2f2bfcaea5d130a67a34a9b;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/skia/src/gpu/GrBitmapTextContext.h b/src/third_party/skia/src/gpu/GrBitmapTextContext.h
index 836cc76..6d4ea6d 100644
--- 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;
 };