Part 1 Of Renaming FrameLoaderClient to LocalFrameClient.

third_party/WebKit/Source/core/loader/DocumentLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2011 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 20 matching lines @@
 
 #include <memory>
 
 #include "core/dom/Document.h"
 #include "core/dom/WeakIdentifierMap.h"
 #include "core/events/Event.h"
 #include "core/frame/Deprecation.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
+#include "core/frame/LocalFrameClient.h"
 #include "core/frame/Settings.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/html/parser/TextResourceDecoder.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/MainThreadDebugger.h"
 #include "core/loader/FrameFetchContext.h"
 #include "core/loader/FrameLoader.h"
-#include "core/loader/FrameLoaderClient.h"
 #include "core/loader/LinkLoader.h"
 #include "core/loader/NetworkHintsInterface.h"
 #include "core/loader/ProgressTracker.h"
 #include "core/loader/appcache/ApplicationCacheHost.h"
 #include "core/loader/resource/CSSStyleSheetResource.h"
 #include "core/loader/resource/FontResource.h"
 #include "core/loader/resource/ImageResource.h"
 #include "core/loader/resource/ScriptResource.h"
 #include "core/page/FrameTree.h"
 #include "core/page/Page.h"
@@ skipping 63 matching lines @@
   // where the redirects originated.
   if (m_isClientRedirect)
     appendRedirect(m_frame->document()->url());
 }
 
 FrameLoader& DocumentLoader::frameLoader() const {
   DCHECK(m_frame);
   return m_frame->loader();
 }
 
-FrameLoaderClient& DocumentLoader::frameLoaderClient() const {
+LocalFrameClient& DocumentLoader::localFrameClient() const {
   DCHECK(m_frame);
-  FrameLoaderClient* client = m_frame->client();
+  LocalFrameClient* client = m_frame->client();
   // LocalFrame clears its |m_client| only after detaching all DocumentLoaders
   // (i.e. calls detachFromFrame() which clears |m_frame|) owned by the
   // LocalFrame's FrameLoader. So, if |m_frame| is non nullptr, |client| is
   // also non nullptr.
   DCHECK(client);
   return *client;
 }
 
 DocumentLoader::~DocumentLoader() {
   DCHECK(!m_frame);
@@ skipping 86 matching lines @@
     ViewportDescriptionWrapper* viewport,
     LinkLoader::MediaPreloadPolicy mediaPolicy) {
   LinkLoader::loadLinksFromHeader(
       response().httpHeaderField(HTTPNames::Link), response().url(),
       m_frame->document(), NetworkHintsInterfaceImpl(),
       LinkLoader::OnlyLoadResources, mediaPolicy, viewport);
 }
 
 void DocumentLoader::didChangePerformanceTiming() {
   if (m_frame && m_frame->isMainFrame() && m_state >= Committed) {
-    frameLoaderClient().didChangePerformanceTiming();
+    localFrameClient().didChangePerformanceTiming();
   }
 }
 
 void DocumentLoader::didObserveLoadingBehavior(
     WebLoadingBehaviorFlag behavior) {
   if (m_frame && m_frame->isMainFrame()) {
     DCHECK_GE(m_state, Committed);
-    frameLoaderClient().didObserveLoadingBehavior(behavior);
+    localFrameClient().didObserveLoadingBehavior(behavior);
   }
 }
 
 void DocumentLoader::updateForSameDocumentNavigation(
     const KURL& newURL,
     SameDocumentNavigationSource sameDocumentNavigationSource) {
   KURL oldURL = m_request.url();
   m_originalRequest.setURL(newURL);
   m_request.setURL(newURL);
   if (sameDocumentNavigationSource == SameDocumentNavigationHistoryApi) {
@@ skipping 113 matching lines @@
 
   DCHECK(timing().fetchStart());
   appendRedirect(requestURL);
   timing().addRedirect(redirectResponse.url(), requestURL);
 
   // If a redirection happens during a back/forward navigation, don't restore
   // any state from the old HistoryItem. There is a provisional history item for
   // back/forward navigation only. In the other case, clearing it is a no-op.
   frameLoader().clearProvisionalHistoryItem();
 
-  frameLoaderClient().dispatchDidReceiveServerRedirectForProvisionalLoad();
+  localFrameClient().dispatchDidReceiveServerRedirectForProvisionalLoad();
 
   return true;
 }
 
 static bool canShowMIMEType(const String& mimeType, LocalFrame* frame) {
   if (MIMETypeRegistry::isSupportedMIMEType(mimeType))
     return true;
   PluginData* pluginData = frame->pluginData();
   return !mimeType.isEmpty() && pluginData &&
          pluginData->supportsMimeType(mimeType);
@@ skipping 416 matching lines @@
                              m_writer ? m_writer->encoding() : emptyAtom, true,
                              ForceSynchronousParsing);
   if (!source.isNull())
     m_writer->appendReplacingData(source);
   endWriting();
 }
 
 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader);
 
 }  // namespace blink