Avoid GPU readback in tex(Sub)Image2D(ImageBitmap)

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 19d831308e299cff8b57d5825a9bd4400b1ecd03..47a03b94419d002851546a4d66429b2b5c7a2eb9 100644
--- a/third_party/WebKit/Source/core/frame/ImageBitmap.cpp
+++ b/third_party/WebKit/Source/core/frame/ImageBitmap.cpp
@@ -466,6 +466,11 @@ unsigned long ImageBitmap::height() const
     return m_image->height();
 }
 
+bool ImageBitmap::isTextureBacked() const
+{
+    return (!m_image->hasSkImage() || m_image->hasContext3DProvider());

[Justin Novosad, 2016/06/07 15:11:07]

This is hard to read. The "!m_image->hasSkImage()" condition implies that
m_image has a mailbox, which is what we really want to know here.  You should
put an isTextureBacked() method directly on StaticBitmapImage and call that
here.

[xidachen, 2016/06/07 17:49:53]

I actually tried that before and it is a bit complicated...

When texImage2D consumes the ImageBitmap, this method tells texImage2D that the
ImageBitmap is texture-backed either:
1. it doesn't have a SkImage, which means it has a mailbox
2. or it has a contextProvider.

But if I put this method in StaticBitmapImage, it should look like this, this
StaticBitmapImage is texture-backed if either:
1. it doesn't have a SkImage, which means it has a mailbox
2. or it has a contextProvider
3. or the SkImage is texture-backed.

Now if put this method in StaticBitmapImage, and texImage2D calls it, all those
texImage-ImageBitmap layout tests will fail under virtual/gpu/. In those layout
tests, ImageBitmap is created from different sources, so it has an SkImage and
that SkImage is texture-backed. But it doesn't have a mailbox, nor does it have
a context provider. In this case, isTextureBacked() should tell texImage2D that
this ImageBitmap is not texture-backed. I understand that this will trigger a
read-back, how should I solve this case?

+}
+
 IntSize ImageBitmap::size() const
 {
     if (!m_image)