Rename FrameLoaderClient* to LocalFrameClient* in web/

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 58 matching lines @@
 // How frames are destroyed
 // ------------------------
 //
 // The main frame is never destroyed and is re-used. The FrameLoader is re-used
 // and a reference to the main frame is kept by the Page.
 //
 // When frame content is replaced, all subframes are destroyed. This happens
 // 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.
 //
 // The client is expected to be set whenever the WebLocalFrameImpl is attached
 // to the DOM.
 
 #include "web/WebLocalFrameImpl.h"
 
 #include <algorithm>
@@ skipping 1395 matching lines @@
   Frame* oldFrame = oldWebFrame->toImplBase()->frame();
   webFrame->setParent(oldWebFrame->parent());
   webFrame->setOpener(oldWebFrame->opener());
   // Note: this *always* temporarily sets a frame owner, even for main frames!
   // When a core Frame is created with no owner, it attempts to set itself as
   // the main frame of the Page. However, this is a provisional frame, and may
   // disappear, so Page::m_mainFrame can't be updated just yet.
   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(
       toWebRemoteFrameImpl(oldWebFrame)->frame()->tree().name(),
       toWebRemoteFrameImpl(oldWebFrame)->frame()->tree().uniqueName());
   webFrame->setCoreFrame(frame);
 
   frame->setOwner(oldFrame->owner());
 
   if (frame->owner() && frame->owner()->isRemote())
     toRemoteFrameOwner(frame->owner())
         ->setSandboxFlags(static_cast<SandboxFlags>(flags));
 
   // We must call init() after m_frame is assigned because it is referenced
   // during init(). Note that this may dispatch JS events; the frame may be
   // detached after init() returns.
   frame->init();
   return webFrame;
 }
 
 WebLocalFrameImpl::WebLocalFrameImpl(
     WebTreeScopeType scope,
     WebFrameClient* client,
     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),
       m_contentSettingsClient(0),
       m_inputEventsScaleFactorForEmulation(1),
       m_interfaceProvider(interfaceProvider),
       m_interfaceRegistry(interfaceRegistry),
       m_webDevToolsFrontend(0),
       m_inputMethodController(new WebInputMethodControllerImpl(this)),
       m_selfKeepAlive(this) {
@@ skipping 13 matching lines @@
                         interfaceProvider,
                         interfaceRegistry) {}
 
 WebLocalFrameImpl::~WebLocalFrameImpl() {
   // The widget for the frame, if any, must have already been closed.
   DCHECK(!m_frameWidget);
   frameCount--;
 }
 
 DEFINE_TRACE(WebLocalFrameImpl) {
-  visitor->trace(m_frameLoaderClientImpl);
+  visitor->trace(m_localFrameClientImpl);
   visitor->trace(m_frame);
   visitor->trace(m_devToolsAgent);
   visitor->trace(m_textFinder);
   visitor->trace(m_printContext);
   visitor->trace(m_contextMenuNode);
   WebFrame::traceFrames(visitor, this);
   WebFrameImplBase::trace(visitor);
 }
 
 void WebLocalFrameImpl::setCoreFrame(LocalFrame* frame) {
   m_frame = frame;
 }
 
 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
   // during init(). Note that this may dispatch JS events; the frame may be
   // detached after init() returns.
   frame()->init();
   if (frame()) {
     if (frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() &&
         !parent() && !opener() &&
         frame()->settings()->getShouldReuseGlobalForUnownedMainFrame()) {
@@ skipping 850 matching lines @@
         createMarkup(startPosition, endPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   } else {
     clipHtml =
         createMarkup(endPosition, startPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   }
 }
 
 }  // namespace blink