third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp - Issue 1761003003: Use a union typdef for the return type of canvas.getContext

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/core/html/HTMLCanvasElement.cpp

Issue 1761003003: Use a union typdef for the return type of canvas.getContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix oilpan -ahem- non-oilpan build Created 4 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

« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLCanvasElement.h ('k') | third_party/WebKit/Source/core/html/HTMLCanvasElement.idl » ('j') | third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 06208a187583d64b581dc4ff03b8426a4852681d..6bef819242b184c1bc75f39cbb7f875cb7fa3b86 100644

--- a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

+++ b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

@@ -208,15 +208,6 @@ void HTMLCanvasElement::registerRenderingContextFactory(PassOwnPtr<CanvasRenderi

renderingContextFactories()[type] = renderingContextFactory;

}

-ScriptValue HTMLCanvasElement::getContext(ScriptState* scriptState, const String& type, const CanvasContextCreationAttributes& attributes)

- CanvasRenderingContext* context = getCanvasRenderingContext(type, attributes);

- if (!context) {

- return ScriptValue::createNull(scriptState);

- }

- return ScriptValue(scriptState, toV8(context, scriptState->context()->Global(), scriptState->isolate()));

CanvasRenderingContext* HTMLCanvasElement::getCanvasRenderingContext(const String& type, const CanvasContextCreationAttributes& attributes)

{

CanvasRenderingContext::ContextType contextType = CanvasRenderingContext::contextTypeFromId(type);