Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(376)

Unified Diff: third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

Issue 2269073002: Revert of Resolving drawImage issue with canvases that contain bitmap images (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp
index d870be3bec4fe7618ccb521332d366bb3ae3961b..f2bfec4694d5ea0db8288d6798317bef582b67cc 100644
--- a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp
@@ -1101,17 +1101,10 @@
m_context->paintRenderingResultsToCanvas(BackBuffer);
}
- RefPtr<SkImage> skImage;
- RefPtr<blink::Image> image = renderingContext()->getImage();
-
- if (image)
- skImage = image->imageForCurrentFrame();
- else
- skImage = hasImageBuffer() ? buffer()->newSkImageSnapshot(hint, reason) : createTransparentImage(size())->imageForCurrentFrame();
-
- if (skImage) {
+ RefPtr<SkImage> image = buffer()->newSkImageSnapshot(hint, reason);
+ if (image) {
*status = NormalSourceImageStatus;
- return StaticBitmapImage::create(skImage.release());
+ return StaticBitmapImage::create(image.release());
}
*status = InvalidSourceImageStatus;

Powered by Google App Engine
This is Rietveld 408576698