third_party/WebKit/Source/bindings/core/v8/ScriptController.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/bindings/core/v8/ScriptController.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/bindings/core/v8/RejectedPromises.cpp ('k') | third_party/WebKit/Source/bindings/core/v8/ScriptFunction.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp

diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp

index daa0565ad8a0b7061d0895a204b414671bcedeb3..c14bd9f1258b40da79a7aad32ca852ffaa6d2ba6 100644

--- a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp

+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp

@@ -468,7 +468,7 @@ bool ScriptController::canExecuteScripts(ReasonForCallingCanExecuteScripts reaso

}

if (frame()->document() && frame()->document()->isViewSource()) {

- ASSERT(frame()->document()->securityOrigin()->isUnique());

+ ASSERT(frame()->document()->getSecurityOrigin()->isUnique());

return true;

}

@@ -585,7 +585,7 @@ void ScriptController::executeScriptInIsolatedWorld(int worldID, const WillBeHea

if (!isolatedWorldWindowProxy->isContextInitialized())

return;

- ScriptState* scriptState = isolatedWorldWindowProxy->scriptState();

+ ScriptState* scriptState = isolatedWorldWindowProxy->getScriptState();

v8::Context::Scope scope(scriptState->context());

v8::Local<v8::Array> resultArray = v8::Array::New(isolate(), sources.size());