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

Unified Diff: third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp

Issue 2653933003: Make stream captures work on canvases that are not in the DOM. (Closed)
Patch Set: rebase Created 3 years, 10 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/canvas/CanvasRenderingContext.cpp
diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp
index 7fdd8f3dc7ee140615707810ebc008f03bc696de..ce4019c173a0769176bb9d07578c481753834b77 100644
--- a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp
+++ b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp
@@ -29,6 +29,7 @@
#include "core/html/canvas/CanvasImageSource.h"
#include "platform/RuntimeEnabledFeatures.h"
#include "platform/weborigin/SecurityOrigin.h"
+#include "public/platform/Platform.h"
constexpr const char* kLegacyCanvasColorSpaceName = "legacy-srgb";
constexpr const char* kSRGBCanvasColorSpaceName = "srgb";
@@ -127,11 +128,15 @@ SkColorType CanvasRenderingContext::colorType() const {
}
void CanvasRenderingContext::dispose() {
+ if (m_finalizeFrameScheduled) {
+ Platform::current()->currentThread()->removeTaskObserver(this);
+ }
+
// HTMLCanvasElement and CanvasRenderingContext have a circular reference.
// When the pair is no longer reachable, their destruction order is non-
// deterministic, so the first of the two to be destroyed needs to notify
// the other in order to break the circular reference. This is to avoid
- // an error when CanvasRenderingContext2D::didProcessTask() is invoked
+ // an error when CanvasRenderingContext::didProcessTask() is invoked
// after the HTMLCanvasElement is destroyed.
if (canvas()) {
canvas()->detachContext();
@@ -143,6 +148,26 @@ void CanvasRenderingContext::dispose() {
}
}
+void CanvasRenderingContext::didDraw(const SkIRect& dirtyRect) {
+ canvas()->didDraw(SkRect::Make(dirtyRect));
+ if (!m_finalizeFrameScheduled) {
+ m_finalizeFrameScheduled = true;
+ Platform::current()->currentThread()->addTaskObserver(this);
+ }
+}
+
+void CanvasRenderingContext::didProcessTask() {
+ Platform::current()->currentThread()->removeTaskObserver(this);
+ m_finalizeFrameScheduled = false;
+
+ if (!canvas())
+ return;
+
+ // The end of a script task that drew content to the canvas is the point
+ // at which the current frame may be considered complete.
+ canvas()->finalizeFrame();
+}
+
CanvasRenderingContext::ContextType CanvasRenderingContext::contextTypeFromId(
const String& id) {
if (id == "2d")

Powered by Google App Engine
This is Rietveld 408576698