third_party/WebKit/Source/core/testing/v8/WebCoreTestSupport.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

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/testing/v8/WebCoreTestSupport.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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/testing/NullExecutionContext.h ('k') | third_party/WebKit/Source/core/timing/Performance.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/testing/v8/WebCoreTestSupport.cpp

diff --git a/third_party/WebKit/Source/core/testing/v8/WebCoreTestSupport.cpp b/third_party/WebKit/Source/core/testing/v8/WebCoreTestSupport.cpp

index 31c543700cd96ef3000129a304b8cae045bd9fb0..7b225b9fe93d9fae92f45d91626d2661f61c5cdf 100644

--- a/third_party/WebKit/Source/core/testing/v8/WebCoreTestSupport.cpp

+++ b/third_party/WebKit/Source/core/testing/v8/WebCoreTestSupport.cpp

@@ -40,7 +40,7 @@ v8::Local<v8::Value> createInternalsObject(v8::Local<v8::Context> context)

{

ScriptState* scriptState = ScriptState::from(context);

v8::Local<v8::Object> global = scriptState->context()->Global();

- ExecutionContext* executionContext = scriptState->executionContext();

+ ExecutionContext* executionContext = scriptState->getExecutionContext();

if (executionContext->isDocument())

return toV8(Internals::create(scriptState), global, scriptState->isolate());

return v8::Local<v8::Value>();

@@ -65,7 +65,7 @@ void resetInternalsObject(v8::Local<v8::Context> context)

ScriptState* scriptState = ScriptState::from(context);

ScriptState::Scope scope(scriptState);

- Document* document = toDocument(scriptState->executionContext());

+ Document* document = toDocument(scriptState->getExecutionContext());

ASSERT(document);

LocalFrame* frame = document->frame();

// Should the document have been detached, the page is assumed being destroyed (=> no reset required.)