Upstream version 5.34.104.0

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

diff --git a/src/third_party/skia/include/gpu/SkGpuDevice.h b/src/third_party/skia/include/gpu/SkGpuDevice.h
index 2888951..8b2170d 100644 (file)
--- a/src/third_party/skia/include/gpu/SkGpuDevice.h
+++ b/src/third_party/skia/include/gpu/SkGpuDevice.h
@@ -16,11 +16,12 @@
 #include "SkBitmapDevice.h"
 #include "SkRegion.h"
 #include "GrContext.h"
-#include "GrTextContext.h"
 
 struct SkDrawProcs;
 struct GrSkDrawProcs;
 
+class GrTextContext;
+
 /**
  *  Subclass of SkBitmapDevice, which directs all drawing to the GrGpu owned by the
  *  canvas.
@@ -130,8 +131,8 @@ public:
      */
     virtual void makeRenderTargetCurrent();
 
-    virtual bool canHandleImageFilter(SkImageFilter*) SK_OVERRIDE;
-    virtual bool filterImage(SkImageFilter*, const SkBitmap&, const SkMatrix&,
+    virtual bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE;
+    virtual bool filterImage(const SkImageFilter*, const SkBitmap&, const SkMatrix&,
                              SkBitmap*, SkIPoint*) SK_OVERRIDE;
 
     class SkAutoCachedTexture; // used internally
@@ -149,7 +150,8 @@ private:
 
     GrClipData      fClipData;
 
-    GrTextContextManager* fTextContextManager;
+    GrTextContext*  fMainTextContext;
+    GrTextContext*  fFallbackTextContext;
 
     // state for our render-target
     GrRenderTarget*     fRenderTarget;
@@ -167,7 +169,7 @@ private:
                                                    bool isOpaque,
                                                    Usage usage) SK_OVERRIDE;
 
-    SkDrawProcs* initDrawForText(GrTextContext*);
+    virtual SkSurface* newSurface(const SkImageInfo&) SK_OVERRIDE;
 
     // sets the render target, clip, and matrix on GrContext. Use forceIdenity to override
     // SkDraw's matrix and draw in device coords.
@@ -210,11 +212,6 @@ private:
                          int tileSize,
                          bool bicubic);
 
-    /**
-     * Returns non-initialized instance.
-     */
-    GrTextContext* getTextContext();
-
     typedef SkBitmapDevice INHERITED;
 };