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

Unified Diff: Source/core/frame/ImageBitmap.cpp

Issue 758493004: canvas: make a temporary buffer when a context doesn't exist. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rename to isPaintable() Created 6 years 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: Source/core/frame/ImageBitmap.cpp
diff --git a/Source/core/frame/ImageBitmap.cpp b/Source/core/frame/ImageBitmap.cpp
index 36a602b72618d4d75743a9536b783504ad0a0acc..ae200eaece78105c65fc4256df2b51b7b43192e6 100644
--- a/Source/core/frame/ImageBitmap.cpp
+++ b/Source/core/frame/ImageBitmap.cpp
@@ -8,7 +8,6 @@
#include "core/html/HTMLCanvasElement.h"
#include "core/html/HTMLVideoElement.h"
#include "core/html/ImageData.h"
-#include "core/html/canvas/CanvasRenderingContext.h"
#include "platform/graphics/BitmapImage.h"
#include "platform/graphics/GraphicsContext.h"
#include "platform/graphics/ImageBuffer.h"
@@ -80,13 +79,10 @@ ImageBitmap::ImageBitmap(HTMLCanvasElement* canvas, const IntRect& cropRect)
, m_cropRect(cropRect)
, m_bitmapOffset(IntPoint())
{
- CanvasRenderingContext* sourceContext = canvas->renderingContext();
- if (sourceContext && sourceContext->is3d())
- sourceContext->paintRenderingResultsToCanvas(BackBuffer);
-
IntRect srcRect = intersection(cropRect, IntRect(IntPoint(), canvas->size()));
m_bitmapRect = IntRect(IntPoint(std::max(0, -cropRect.x()), std::max(0, -cropRect.y())), srcRect.size());
- m_bitmap = cropImage(canvas->buffer()->copyImage(CopyBackingStore).get(), cropRect);
+ ASSERT(canvas->isPaintable());
+ m_bitmap = cropImage(canvas->copiedImage(BackBuffer).get(), cropRect);
}
ImageBitmap::ImageBitmap(ImageData* data, const IntRect& cropRect)

Powered by Google App Engine
This is Rietveld 408576698