Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Unified Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 2712343003: Rename FrameLoaderClient* to LocalFrameClient* in web/ (Closed)
Patch Set: Created 3 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/web/WebLocalFrameImpl.h ('k') | third_party/WebKit/Source/web/WebNode.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
index 75d3864d39fc5bd556736709e9f0dde073e3fd17..2a170a5d60cfe4692e83b3ab10392418383727d1 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
@@ -76,8 +76,8 @@
// in Frame::detachChildren for each subframe in a pre-order depth-first
// traversal. Note that child node order may not match DOM node order!
// detachChildren() (virtually) calls Frame::detach(), which again calls
-// FrameLoaderClient::detached(). This triggers WebFrame to clear its reference
-// to LocalFrame. FrameLoaderClient::detached() also notifies the embedder via
+// LocalFrameClient::detached(). This triggers WebFrame to clear its reference
+// to LocalFrame. LocalFrameClient::detached() also notifies the embedder via
// WebFrameClient that the frame is detached. Most embedders will invoke
// close() on the WebFrame at this point, triggering its deletion unless
// something else is still retaining a reference.
@@ -1493,9 +1493,9 @@ WebLocalFrameImpl* WebLocalFrameImpl::createProvisional(
FrameOwner* tempOwner = DummyFrameOwner::create();
// TODO(dcheng): This block is very similar to initializeCoreFrame. Try to
// reuse it here.
- LocalFrame* frame = LocalFrame::create(
- webFrame->m_frameLoaderClientImpl.get(), oldFrame->host(), tempOwner,
- interfaceProvider, interfaceRegistry);
+ LocalFrame* frame = LocalFrame::create(webFrame->m_localFrameClientImpl.get(),
+ oldFrame->host(), tempOwner,
+ interfaceProvider, interfaceRegistry);
// Set the name and unique name directly, bypassing any of the normal logic
// to calculate unique name.
frame->tree().setPrecalculatedName(
@@ -1522,7 +1522,7 @@ WebLocalFrameImpl::WebLocalFrameImpl(
blink::InterfaceProvider* interfaceProvider,
blink::InterfaceRegistry* interfaceRegistry)
: WebLocalFrame(scope),
- m_frameLoaderClientImpl(FrameLoaderClientImpl::create(this)),
+ m_localFrameClientImpl(LocalFrameClientImpl::create(this)),
m_frameWidget(0),
m_client(client),
m_autofillClient(0),
@@ -1556,7 +1556,7 @@ WebLocalFrameImpl::~WebLocalFrameImpl() {
}
DEFINE_TRACE(WebLocalFrameImpl) {
- visitor->trace(m_frameLoaderClientImpl);
+ visitor->trace(m_localFrameClientImpl);
visitor->trace(m_frame);
visitor->trace(m_devToolsAgent);
visitor->trace(m_textFinder);
@@ -1574,7 +1574,7 @@ void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host,
FrameOwner* owner,
const AtomicString& name,
const AtomicString& uniqueName) {
- setCoreFrame(LocalFrame::create(m_frameLoaderClientImpl.get(), host, owner,
+ setCoreFrame(LocalFrame::create(m_localFrameClientImpl.get(), host, owner,
m_interfaceProvider, m_interfaceRegistry));
frame()->tree().setPrecalculatedName(name, uniqueName);
// We must call init() after m_frame is assigned because it is referenced
« no previous file with comments | « third_party/WebKit/Source/web/WebLocalFrameImpl.h ('k') | third_party/WebKit/Source/web/WebNode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698