ImageBitmap using StaticBitmapImage instead of SkImage

ImageBitmap using StaticBitmapImage instead of SkImage

Current ImageBitmap holds a RefPtr<SkImage>, this CL changes it to hold
a RefPtr<StaticBitmapImage>.

Committed: https://crrev.com/20c2d44f6bb15c98c153c65115722d351cddc3e8
Cr-Commit-Position: refs/heads/master@{#361018}

[xidachen, 2015-11-19 13:00:41]

Description was changed from

==========
ImageBitmap using StaticBitmapImage instead of SkImage

Current ImageBitmap holds a RefPtr<SkImage>, this CL changes it to hold
a RefPtr<StaticBitmapImage>.
==========

to

==========
ImageBitmap using StaticBitmapImage instead of SkImage

Current ImageBitmap holds a RefPtr<SkImage>, this CL changes it to hold
a RefPtr<StaticBitmapImage>.
==========

[xidachen, 2015-11-19 13:00:42]

xidachen@chromium.org changed reviewers:
+ junov@chromium.org

[xidachen, 2015-11-19 13:01:21]

Hi Justin,

Let's push this CL out first, which will make the transferable easier.

Thank you.

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

https://codereview.chromium.org/1457683006/diff/1/third_party/WebKit/Source/c...
File third_party/WebKit/Source/core/frame/ImageBitmap.h (right):

https://codereview.chromium.org/1457683006/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/frame/ImageBitmap.h:36: static
PassRefPtrWillBeRawPtr<ImageBitmap> create(PassRefPtr<StaticBitmapImage>);
Why is this needed?

[xidachen, 2015-11-20 21:51:27]

https://codereview.chromium.org/1457683006/diff/1/third_party/WebKit/Source/c...
File third_party/WebKit/Source/core/frame/ImageBitmap.h (right):

https://codereview.chromium.org/1457683006/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/frame/ImageBitmap.h:36: static
PassRefPtrWillBeRawPtr<ImageBitmap> create(PassRefPtr<StaticBitmapImage>);
On 2015/11/20 21:23:12, Justin Novosad wrote:
> Why is this needed?

Done.

[Justin Novosad, 2015-11-21 04:26:29]

lgtm

But this is going to collide with https://codereview.chromium.org/1466773002/

Let's have a lottery. I am going to hit the commit checkboxes on both CLs right
now. Whoever loses the race gets to resolve a merge conflict!

[Justin Novosad, 2015-11-21 04:26:34]

The CQ bit was checked by junov@chromium.org

[commit-bot: I haz the power, 2015-11-21 04:26:38]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1457683006/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1457683006/20001

[commit-bot: I haz the power, 2015-11-21 05:45:36]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-11-21 05:45:37]

Failed to apply patch for third_party/WebKit/Source/core/frame/ImageBitmap.cpp:
While running git apply --index -3 -p1;
  error: patch failed: third_party/WebKit/Source/core/frame/ImageBitmap.cpp:127
  Falling back to three-way merge...
  Applied patch to 'third_party/WebKit/Source/core/frame/ImageBitmap.cpp' with
conflicts.
  U third_party/WebKit/Source/core/frame/ImageBitmap.cpp

Patch:       third_party/WebKit/Source/core/frame/ImageBitmap.cpp
Index: third_party/WebKit/Source/core/frame/ImageBitmap.cpp
diff --git a/third_party/WebKit/Source/core/frame/ImageBitmap.cpp
b/third_party/WebKit/Source/core/frame/ImageBitmap.cpp
index
60f71c7f1a8f29312bdf1527b31549a72dee39f2..aa488c8041553aa9b82fbe7a6291df145f1da11c
100644
--- a/third_party/WebKit/Source/core/frame/ImageBitmap.cpp
+++ b/third_party/WebKit/Source/core/frame/ImageBitmap.cpp
@@ -8,12 +8,6 @@
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
-#include "platform/graphics/GraphicsContext.h"
-#include "platform/graphics/ImageBuffer.h"
-#include "platform/graphics/StaticBitmapImage.h"
-#include "platform/graphics/paint/DrawingRecorder.h"
-#include "platform/graphics/paint/SkPictureBuilder.h"
-#include "third_party/skia/include/core/SkScalar.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "wtf/RefPtr.h"
 
@@ -29,7 +23,7 @@ static inline IntRect normalizeRect(const IntRect& rect)
 
 ImageBitmap::ImageBitmap(HTMLImageElement* image, const IntRect& cropRect)
 {
-    m_image = cropImage(image->cachedImage()->image()->imageForCurrentFrame(),
cropRect);
+    m_image =
cropImage(static_cast<StaticBitmapImage*>(image->cachedImage()->image()),
cropRect);
 }
 
 ImageBitmap::ImageBitmap(HTMLVideoElement* video, const IntRect& cropRect)
@@ -46,13 +40,13 @@ ImageBitmap::ImageBitmap(HTMLVideoElement* video, const
IntRect& cropRect)
 
     IntPoint dstPoint = IntPoint(std::max(0, -cropRect.x()), std::max(0,
-cropRect.y()));
     video->paintCurrentFrame(buffer->canvas(), IntRect(dstPoint,
srcRect.size()), nullptr);
-    m_image = buffer->newSkImageSnapshot(PreferNoAcceleration);
+    m_image =
StaticBitmapImage::create(buffer->newSkImageSnapshot(PreferNoAcceleration));
 }
 
 ImageBitmap::ImageBitmap(HTMLCanvasElement* canvas, const IntRect& cropRect)
 {
     ASSERT(canvas->isPaintable());
-    m_image = cropImage(canvas->copiedImage(BackBuffer,
PreferAcceleration)->imageForCurrentFrame(), cropRect);
+    m_image =
cropImage(static_cast<StaticBitmapImage*>(canvas->copiedImage(BackBuffer,
PreferAcceleration).get()), cropRect);
 }
 
 ImageBitmap::ImageBitmap(ImageData* data, const IntRect& cropRect)
@@ -64,7 +58,7 @@ ImageBitmap::ImageBitmap(ImageData* data, const IntRect&
cropRect)
         return;
 
     if (srcRect.isEmpty()) {
-        m_image = buffer->newSkImageSnapshot(PreferNoAcceleration);
+        m_image =
StaticBitmapImage::create(buffer->newSkImageSnapshot(PreferNoAcceleration));
         return;
     }
 
@@ -74,17 +68,17 @@ ImageBitmap::ImageBitmap(ImageData* data, const IntRect&
cropRect)
     if (cropRect.y() < 0)
         dstPoint.setY(-cropRect.y());
     buffer->putByteArray(Unmultiplied, data->data()->data(), data->size(),
srcRect, dstPoint);
-    m_image = buffer->newSkImageSnapshot(PreferNoAcceleration);
+    m_image =
StaticBitmapImage::create(buffer->newSkImageSnapshot(PreferNoAcceleration));
 }
 
 ImageBitmap::ImageBitmap(ImageBitmap* bitmap, const IntRect& cropRect)
 {
-    m_image = cropImage(bitmap->skImage(), cropRect);
+    m_image = cropImage(bitmap->bitmapImage(), cropRect);
 }
 
 ImageBitmap::ImageBitmap(Image* image, const IntRect& cropRect)
 {
-    m_image = cropImage(image->imageForCurrentFrame(), cropRect);
+    m_image = cropImage(static_cast<StaticBitmapImage*>(image), cropRect);
 }
 
 ImageBitmap::~ImageBitmap()
@@ -127,7 +121,7 @@ PassRefPtrWillBeRawPtr<ImageBitmap>
ImageBitmap::create(Image* image, const IntR
     return adoptRefWillBeNoop(new ImageBitmap(image, normalizedCropRect));
 }
 
-PassRefPtr<SkImage> ImageBitmap::cropImage(PassRefPtr<SkImage> image, const
IntRect& cropRect)
+PassRefPtr<StaticBitmapImage> ImageBitmap::cropImage(StaticBitmapImage* image,
const IntRect& cropRect)
 {
     ASSERT(image);
 
@@ -135,12 +129,12 @@ PassRefPtr<SkImage>
ImageBitmap::cropImage(PassRefPtr<SkImage> image, const IntR
     const IntRect srcRect = intersection(imgRect, cropRect);
 
     if (cropRect == srcRect)
-        return adoptRef(image->newSubset(srcRect));
+        return
StaticBitmapImage::create(adoptRef(image->imageForCurrentFrame()->newSubset(srcRect)));
 
     RefPtr<SkSurface> surface =
adoptRef(SkSurface::NewRasterN32Premul(cropRect.width(), cropRect.height()));
 
     if (srcRect.isEmpty())
-        return adoptRef(surface->newImageSnapshot());
+        return
StaticBitmapImage::create(adoptRef(surface->newImageSnapshot()));
 
     SkScalar dstLeft = std::min(0, -cropRect.x());
     SkScalar dstTop = std::min(0, -cropRect.y());
@@ -148,8 +142,8 @@ PassRefPtr<SkImage>
ImageBitmap::cropImage(PassRefPtr<SkImage> image, const IntR
         dstLeft = -cropRect.x();
     if (cropRect.y() < 0)
         dstTop = -cropRect.y();
-    surface->getCanvas()->drawImage(image.get(), dstLeft, dstTop);
-    return adoptRef(surface->newImageSnapshot());
+    surface->getCanvas()->drawImage(image->imageForCurrentFrame().get(),
dstLeft, dstTop);
+    return StaticBitmapImage::create(adoptRef(surface->newImageSnapshot()));
 }
 
 unsigned long ImageBitmap::width() const
@@ -183,7 +177,7 @@ void ImageBitmap::notifyImageSourceChanged()
 PassRefPtr<Image> ImageBitmap::getSourceImageForCanvas(SourceImageStatus*
status, AccelerationHint) const
 {
     *status = NormalSourceImageStatus;
-    return m_image ? StaticBitmapImage::create(m_image) : nullptr;
+    return m_image ? m_image : nullptr;
 }
 
 void ImageBitmap::adjustDrawRects(FloatRect* srcRect, FloatRect* dstRect) const

[commit-bot: I haz the power, 2015-11-21 05:45:37]

The CQ bit was unchecked by commit-bot@chromium.org

[xidachen, 2015-11-21 07:30:28]

The CQ bit was checked by xidachen@chromium.org

[xidachen, 2015-11-21 07:30:29]

The patchset sent to the CQ was uploaded after l-g-t-m from junov@chromium.org
Link to the patchset: https://codereview.chromium.org/1457683006/#ps40001
(title: "sync with master")

[commit-bot: I haz the power, 2015-11-21 07:30:35]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1457683006/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1457683006/40001

[commit-bot: I haz the power, 2015-11-21 09:24:24]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2015-11-21 09:25:06]

Patchset 3 (id:??) landed as
https://crrev.com/20c2d44f6bb15c98c153c65115722d351cddc3e8
Cr-Commit-Position: refs/heads/master@{#361018}