Upstream version 5.34.104.0

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

diff --git a/src/third_party/skia/include/effects/SkMergeImageFilter.h b/src/third_party/skia/include/effects/SkMergeImageFilter.h
index ad464d3..36eaaf3 100755 (executable)
--- a/src/third_party/skia/include/effects/SkMergeImageFilter.h
+++ b/src/third_party/skia/include/effects/SkMergeImageFilter.h
@@ -25,13 +25,11 @@ public:
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMergeImageFilter)
 
 protected:
-    SkMergeImageFilter(SkFlattenableReadBuffer& buffer);
-    virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+    SkMergeImageFilter(SkReadBuffer& buffer);
+    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
 
     virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
-                               SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
-    virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) SK_OVERRIDE;
-
+                               SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
 private:
     uint8_t*            fModes; // SkXfermode::Mode