Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / include / effects / SkDisplacementMapEffect.h

diff --git a/src/third_party/skia/include/effects/SkDisplacementMapEffect.h b/src/third_party/skia/include/effects/SkDisplacementMapEffect.h
index d789ca2..5de4814 100644 (file)
--- a/src/third_party/skia/include/effects/SkDisplacementMapEffect.h
+++ b/src/third_party/skia/include/effects/SkDisplacementMapEffect.h
@@ -36,24 +36,29 @@ public:
                                const SkBitmap& src,
                                const SkMatrix& ctm,
                                SkBitmap* dst,
-                               SkIPoint* offset) SK_OVERRIDE;
+                               SkIPoint* offset) const SK_OVERRIDE;
+    virtual void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE;
+
+    virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&,
+                                SkIRect* dst) const SK_OVERRIDE;
+
 #if SK_SUPPORT_GPU
     virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; }
     virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const SkMatrix& ctm,
-                                SkBitmap* result, SkIPoint* offset) SK_OVERRIDE;
+                                SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
 #endif
 
 protected:
-    explicit SkDisplacementMapEffect(SkFlattenableReadBuffer& buffer);
-    virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+    explicit SkDisplacementMapEffect(SkReadBuffer& buffer);
+    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
 
 private:
     ChannelSelectorType fXChannelSelector;
     ChannelSelectorType fYChannelSelector;
     SkScalar fScale;
     typedef SkImageFilter INHERITED;
-    SkImageFilter* getDisplacementInput() { return getInput(0); }
-    SkImageFilter* getColorInput() { return getInput(1); }
+    const SkImageFilter* getDisplacementInput() const { return getInput(0); }
+    const SkImageFilter* getColorInput() const { return getInput(1); }
 };
 
 #endif