ImageBitmap using StaticBitmapImage instead of SkImage

third_party/WebKit/Source/core/frame/ImageBitmap.h

Index: third_party/WebKit/Source/core/frame/ImageBitmap.h
diff --git a/third_party/WebKit/Source/core/frame/ImageBitmap.h b/third_party/WebKit/Source/core/frame/ImageBitmap.h
index 41f6ec4e51548d2c7e7339f1098fe836cb4d882c..f030e46a63988ee45f44359ab0344cc231a591ab 100644
--- a/third_party/WebKit/Source/core/frame/ImageBitmap.h
+++ b/third_party/WebKit/Source/core/frame/ImageBitmap.h
@@ -12,8 +12,8 @@
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/Image.h"
 #include "platform/graphics/ImageBuffer.h"
+#include "platform/graphics/StaticBitmapImage.h"
 #include "platform/heap/Handle.h"
-#include "third_party/skia/include/core/SkImage.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 
@@ -33,8 +33,9 @@ public:
     static PassRefPtrWillBeRawPtr<ImageBitmap> create(ImageData*, const IntRect&);
     static PassRefPtrWillBeRawPtr<ImageBitmap> create(ImageBitmap*, const IntRect&);
     static PassRefPtrWillBeRawPtr<ImageBitmap> create(Image*, const IntRect&);
+    static PassRefPtrWillBeRawPtr<ImageBitmap> create(PassRefPtr<StaticBitmapImage>);

[Justin Novosad, 2015/11/20 21:23:12]

Why is this needed?

[xidachen, 2015/11/20 21:51:26]

Done.

 
-    SkImage* skImage() const { return (m_image) ? m_image.get() : nullptr; }
+    StaticBitmapImage* bitmapImage() const { return (m_image) ? m_image.get() : nullptr; }
     unsigned long width() const;
     unsigned long height() const;
     IntSize size() const;
@@ -56,14 +57,15 @@ private:
     ImageBitmap(ImageData*, const IntRect&);
     ImageBitmap(ImageBitmap*, const IntRect&);
     ImageBitmap(Image*, const IntRect&);
+    ImageBitmap(PassRefPtr<StaticBitmapImage>);
 
-    PassRefPtr<SkImage> cropImage(PassRefPtr<SkImage>, const IntRect&);
+    PassRefPtr<StaticBitmapImage> cropImage(StaticBitmapImage*, const IntRect&);
 
     // ImageLoaderClient
     void notifyImageSourceChanged() override;
     bool requestsHighLiveResourceCachePriority() override { return true; }
 
-    RefPtr<SkImage> m_image;
+    RefPtr<StaticBitmapImage> m_image;
 };
 
 } // namespace blink