third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp - Issue 2221173003: Updates on canvas backreference for canvas rendering contexts

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

Issue 2221173003: Updates on canvas backreference for canvas rendering contexts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Further simplify layout test 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

« third_party/WebKit/LayoutTests/fast/canvas/rendering-contexts-back-references.html ('K') | « third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h ('k') | third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

index ec3b48206e6f0da15963f01768e62ad4a3a33ec1..c1048da6b52fc3bc8038867496ca3ed5fb4a35c2 100644

--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

@@ -28,6 +28,7 @@

#include "bindings/core/v8/ExceptionMessages.h"

#include "bindings/core/v8/ExceptionState.h"

#include "bindings/core/v8/V8BindingMacros.h"

+#include "bindings/modules/v8/HTMLCanvasElementOrOffscreenCanvas.h"

#include "bindings/modules/v8/WebGLAny.h"

#include "core/dom/DOMArrayBuffer.h"

#include "core/dom/DOMTypedArray.h"

@@ -6496,4 +6497,12 @@ void WebGLRenderingContextBase::restoreUnpackParameters()

contextGL()->PixelStorei(GL_UNPACK_ALIGNMENT, m_unpackAlignment);

}

+void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas(HTMLCanvasElementOrOffscreenCanvas& result) const

+ if (canvas())

+ result.setHTMLCanvasElement(canvas());

+ else

+ result.setOffscreenCanvas(getOffscreenCanvas());

} // namespace blink