| Index: third_party/WebKit/Source/modules/imagebitmap/ImageBitmapRenderingContext.cpp
|
| diff --git a/third_party/WebKit/Source/modules/imagebitmap/ImageBitmapRenderingContext.cpp b/third_party/WebKit/Source/modules/imagebitmap/ImageBitmapRenderingContext.cpp
|
| index e2f77da4c0f4f2d3b661fa7797adac7d44304b1d..06b4cb96b8a16fd02fa2997f52d5b4901686063f 100644
|
| --- a/third_party/WebKit/Source/modules/imagebitmap/ImageBitmapRenderingContext.cpp
|
| +++ b/third_party/WebKit/Source/modules/imagebitmap/ImageBitmapRenderingContext.cpp
|
| @@ -44,11 +44,7 @@ void ImageBitmapRenderingContext::transferFromImageBitmap(
|
| if (!m_image)
|
| return;
|
|
|
| - // TODO(ccameron): Determine the correct color behavior here.
|
| - // ImageBitmapRenderingContext.
|
| - // https://crbug.com/672306
|
| - sk_sp<SkImage> skImage =
|
| - m_image->imageForCurrentFrame(ColorBehavior::transformToGlobalTarget());
|
| + sk_sp<SkImage> skImage = m_image->imageForCurrentFrame();
|
| if (skImage->isTextureBacked()) {
|
| // TODO(junov): crbug.com/585607 Eliminate this readback and use an
|
| // ExternalTextureLayer
|
| @@ -71,9 +67,7 @@ bool ImageBitmapRenderingContext::paint(GraphicsContext& gc, const IntRect& r) {
|
| return true;
|
|
|
| // With impl-side painting, it is unsafe to use a gpu-backed SkImage
|
| - DCHECK(
|
| - !m_image->imageForCurrentFrame(ColorBehavior::transformToGlobalTarget())
|
| - ->isTextureBacked());
|
| + DCHECK(!m_image->imageForCurrentFrame()->isTextureBacked());
|
| gc.drawImage(m_image.get(), r, nullptr, creationAttributes().alpha()
|
| ? SkBlendMode::kSrcOver
|
| : SkBlendMode::kSrc);
|
|
|