third_party/WebKit/Source/web/WebFrame.cpp - Issue 1780603002: blink: Rename bindings/ methods 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/web/WebFrame.cpp

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

Patch Set: clash-bindings: rebase 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/modules/filesystem/DataTransferItemFileSystem.cpp ('k') | third_party/WebKit/Source/web/WebPluginContainerImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/WebFrame.cpp

diff --git a/third_party/WebKit/Source/web/WebFrame.cpp b/third_party/WebKit/Source/web/WebFrame.cpp

index e77815dafa081d838ec43a2151e113506ff9f5d6..8f185679f5004756b27b28c4b10bb6ca20d7c6b5 100644

--- a/third_party/WebKit/Source/web/WebFrame.cpp

+++ b/third_party/WebKit/Source/web/WebFrame.cpp

@@ -76,8 +76,8 @@ bool WebFrame::swap(WebFrame* frame)

v8::HandleScope handleScope(v8::Isolate::GetCurrent());

HashMap<DOMWrapperWorld*, v8::Local<v8::Object>> globals;

- oldFrame->windowProxyManager()->clearForNavigation();

- oldFrame->windowProxyManager()->releaseGlobals(globals);

+ oldFrame->getWindowProxyManager()->clearForNavigation();

+ oldFrame->getWindowProxyManager()->releaseGlobals(globals);

// Although the Document in this frame is now unloaded, many resources

// associated with the frame itself have not yet been freed yet.

@@ -105,7 +105,7 @@ bool WebFrame::swap(WebFrame* frame)

toWebRemoteFrameImpl(frame)->initializeCoreFrame(host, owner, name, uniqueName);

}

- frame->toImplBase()->frame()->windowProxyManager()->setGlobals(globals);

+ frame->toImplBase()->frame()->getWindowProxyManager()->setGlobals(globals);

m_parent = nullptr;