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

Unified Diff: third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp

Issue 2493673002: Synchronize OffscreenCanvas content with the placeholder canvas (Closed)
Patch Set: fix obsolete test Created 4 years, 1 month 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/bindings/core/v8/ScriptValueSerializer.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
index 379ef8f1301e4e957b9aa6387aadc71c9aeab83d..d34cebb54db3a4ec67dab3a705215f4a1a36563e 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
@@ -1329,7 +1329,7 @@ ScriptValueSerializer::writeTransferredOffscreenCanvas(
next);
m_writer.writeTransferredOffscreenCanvas(
offscreenCanvas->width(), offscreenCanvas->height(),
- offscreenCanvas->getAssociatedCanvasId(), offscreenCanvas->clientId(),
+ offscreenCanvas->placeholderCanvasId(), offscreenCanvas->clientId(),
offscreenCanvas->sinkId(), offscreenCanvas->localId(),
offscreenCanvas->nonceHigh(), offscreenCanvas->nonceLow());
return nullptr;
@@ -2600,7 +2600,7 @@ bool ScriptValueDeserializer::tryGetTransferredOffscreenCanvas(
uint64_t nonceLow,
v8::Local<v8::Value>* object) {
OffscreenCanvas* offscreenCanvas = OffscreenCanvas::create(width, height);
- offscreenCanvas->setAssociatedCanvasId(canvasId);
+ offscreenCanvas->setPlaceholderCanvasId(canvasId);
offscreenCanvas->setSurfaceId(clientId, sinkId, localId, nonceHigh, nonceLow);
*object = toV8(offscreenCanvas, m_reader.getScriptState());
if ((*object).IsEmpty())

Powered by Google App Engine
This is Rietveld 408576698