Have Frame::loader() return a reference

Source/web/WebFrameImpl.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 533 matching lines @@
 
 long long WebFrameImpl::embedderIdentifier() const
 {
     return m_embedderIdentifier;
 }
 
 WebVector<WebIconURL> WebFrameImpl::iconURLs(int iconTypesMask) const
 {
     // The URL to the icon may be in the header. As such, only
     // ask the loader for the icon if it's finished loading.
-    if (frame()->loader()->state() == FrameStateComplete)
-        return frame()->loader()->icon()->urlsForTypes(iconTypesMask);
+    if (frame()->loader().state() == FrameStateComplete)
+        return frame()->loader().icon()->urlsForTypes(iconTypesMask);
     return WebVector<WebIconURL>();
 }
 
 WebSize WebFrameImpl::scrollOffset() const
 {
     FrameView* view = frameView();
     if (!view)
         return WebSize();
     return view->scrollOffset();
 }
@@ skipping 47 matching lines @@
 
 WebView* WebFrameImpl::view() const
 {
     return viewImpl();
 }
 
 WebFrame* WebFrameImpl::opener() const
 {
     if (!frame())
         return 0;
-    return fromFrame(frame()->loader()->opener());
+    return fromFrame(frame()->loader().opener());
 }
 
 void WebFrameImpl::setOpener(const WebFrame* webFrame)
 {
-    frame()->loader()->setOpener(webFrame ? toWebFrameImpl(webFrame)->frame() : 0);
+    frame()->loader().setOpener(webFrame ? toWebFrameImpl(webFrame)->frame() : 0);
 }
 
 WebFrame* WebFrameImpl::parent() const
 {
     if (!frame())
         return 0;
     return fromFrame(frame()->tree().parent());
 }
 
 WebFrame* WebFrameImpl::top() const
@@ skipping 167 matching lines @@
     if (!frame())
         return;
     if (!frame()->settings()->isScriptEnabled())
         return;
     V8GCController::collectGarbage(v8::Isolate::GetCurrent());
 }
 
 bool WebFrameImpl::checkIfRunInsecureContent(const WebURL& url) const
 {
     ASSERT(frame());
-    return frame()->loader()->mixedContentChecker()->canRunInsecureContent(frame()->document()->securityOrigin(), url);
+    return frame()->loader().mixedContentChecker()->canRunInsecureContent(frame()->document()->securityOrigin(), url);
 }
 
 v8::Handle<v8::Value> WebFrameImpl::executeScriptAndReturnValue(const WebScriptSource& source)
 {
     ASSERT(frame());
 
     // FIXME: This fake user gesture is required to make a bunch of pyauto
     // tests pass. If this isn't needed in non-test situations, we should
     // consider removing this code and changing the tests.
     // http://code.google.com/p/chromium/issues/detail?id=86397
@@ skipping 61 matching lines @@
 
     RefPtr<DOMFileSystemBase> fileSystem = DOMFileSystem::create(frame()->document(), fileSystemName, static_cast<WebCore::FileSystemType>(type), KURL(ParsedURLString, fileSystemPath.utf8().data()));
     if (isDirectory)
         return toV8(DirectoryEntry::create(fileSystem, filePath), v8::Handle<v8::Object>(), toIsolate(frame()));
     return toV8(FileEntry::create(fileSystem, filePath), v8::Handle<v8::Object>(), toIsolate(frame()));
 }
 
 void WebFrameImpl::reload(bool ignoreCache)
 {
     ASSERT(frame());
-    frame()->loader()->reload(ignoreCache ? EndToEndReload : NormalReload);
+    frame()->loader().reload(ignoreCache ? EndToEndReload : NormalReload);
 }
 
 void WebFrameImpl::reloadWithOverrideURL(const WebURL& overrideUrl, bool ignoreCache)
 {
     ASSERT(frame());
-    frame()->loader()->reload(ignoreCache ? EndToEndReload : NormalReload, overrideUrl);
+    frame()->loader().reload(ignoreCache ? EndToEndReload : NormalReload, overrideUrl);
 }
 
 void WebFrameImpl::loadRequest(const WebURLRequest& request)
 {
     ASSERT(frame());
     ASSERT(!request.isNull());
     const ResourceRequest& resourceRequest = request.toResourceRequest();
 
     if (resourceRequest.url().protocolIs("javascript")) {
         loadJavaScriptURL(resourceRequest.url());
         return;
     }
 
-    frame()->loader()->load(FrameLoadRequest(0, resourceRequest));
+    frame()->loader().load(FrameLoadRequest(0, resourceRequest));
 }
 
 void WebFrameImpl::loadHistoryItem(const WebHistoryItem& item)
 {
     ASSERT(frame());
     RefPtr<HistoryItem> historyItem = PassRefPtr<HistoryItem>(item);
     ASSERT(historyItem);
 
-    frame()->loader()->prepareForHistoryNavigation();
-    RefPtr<HistoryItem> currentItem = frame()->loader()->history()->currentItem();
+    frame()->loader().prepareForHistoryNavigation();
+    RefPtr<HistoryItem> currentItem = frame()->loader().history()->currentItem();
     m_inSameDocumentHistoryLoad = currentItem && currentItem->shouldDoSameDocumentNavigationTo(historyItem.get());
     frame()->page()->goToItem(historyItem.get());
     m_inSameDocumentHistoryLoad = false;
 }
 
 void WebFrameImpl::loadData(const WebData& data, const WebString& mimeType, const WebString& textEncoding, const WebURL& baseURL, const WebURL& unreachableURL, bool replace)
 {
     ASSERT(frame());
 
     // If we are loading substitute data to replace an existing load, then
     // inherit all of the properties of that original request.  This way,
     // reload will re-attempt the original request.  It is essential that
     // we only do this when there is an unreachableURL since a non-empty
     // unreachableURL informs FrameLoader::reload to load unreachableURL
     // instead of the currently loaded URL.
     ResourceRequest request;
     if (replace && !unreachableURL.isEmpty())
-        request = frame()->loader()->originalRequest();
+        request = frame()->loader().originalRequest();
     request.setURL(baseURL);
 
     FrameLoadRequest frameRequest(0, request, SubstituteData(data, mimeType, textEncoding, unreachableURL));
     ASSERT(frameRequest.substituteData().isValid());
     frameRequest.setLockBackForwardList(replace);
-    frame()->loader()->load(frameRequest);
+    frame()->loader().load(frameRequest);
 }
 
 void WebFrameImpl::loadHTMLString(const WebData& data, const WebURL& baseURL, const WebURL& unreachableURL, bool replace)
 {
     ASSERT(frame());
     loadData(data, WebString::fromUTF8("text/html"), WebString::fromUTF8("UTF-8"), baseURL, unreachableURL, replace);
 }
 
 bool WebFrameImpl::isLoading() const
 {
     if (!frame())
         return false;
-    return frame()->loader()->isLoading();
+    return frame()->loader().isLoading();
 }
 
 void WebFrameImpl::stopLoading()
 {
     if (!frame())
         return;
     // FIXME: Figure out what we should really do here.  It seems like a bug
     // that FrameLoader::stopLoading doesn't call stopAllLoaders.
-    frame()->loader()->stopAllLoaders();
+    frame()->loader().stopAllLoaders();
 }
 
 WebDataSource* WebFrameImpl::provisionalDataSource() const
 {
     ASSERT(frame());
 
     // We regard the policy document loader as still provisional.
-    DocumentLoader* documentLoader = frame()->loader()->provisionalDocumentLoader();
+    DocumentLoader* documentLoader = frame()->loader().provisionalDocumentLoader();
     if (!documentLoader)
-        documentLoader = frame()->loader()->policyDocumentLoader();
+        documentLoader = frame()->loader().policyDocumentLoader();
 
     return DataSourceForDocLoader(documentLoader);
 }
 
 WebDataSource* WebFrameImpl::dataSource() const
 {
     ASSERT(frame());
-    return DataSourceForDocLoader(frame()->loader()->documentLoader());
+    return DataSourceForDocLoader(frame()->loader().documentLoader());
 }
 
 WebHistoryItem WebFrameImpl::previousHistoryItem() const
 {
     ASSERT(frame());
     // We use the previous item here because documentState (filled-out forms)
     // only get saved to history when it becomes the previous item.  The caller
     // is expected to query the history item after a navigation occurs, after
     // the desired history item has become the previous entry.
-    return WebHistoryItem(frame()->loader()->history()->previousItem());
+    return WebHistoryItem(frame()->loader().history()->previousItem());
 }
 
 WebHistoryItem WebFrameImpl::currentHistoryItem() const
 {
     ASSERT(frame());
 
     // We're shutting down.
-    if (!frame()->loader()->activeDocumentLoader())
+    if (!frame()->loader().activeDocumentLoader())
         return WebHistoryItem();
 
     // If we are still loading, then we don't want to clobber the current
     // history item as this could cause us to lose the scroll position and
     // document state.  However, it is OK for new navigations.
     // FIXME: Can we make this a plain old getter, instead of worrying about
     // clobbering here?
-    if (!m_inSameDocumentHistoryLoad && (frame()->loader()->loadType() == FrameLoadTypeStandard
-        || !frame()->loader()->activeDocumentLoader()->isLoadingInAPISense()))
-        frame()->loader()->history()->saveDocumentAndScrollState();
+    if (!m_inSameDocumentHistoryLoad && (frame()->loader().loadType() == FrameLoadTypeStandard
+        || !frame()->loader().activeDocumentLoader()->isLoadingInAPISense()))
+        frame()->loader().history()->saveDocumentAndScrollState();
 
-    if (HistoryItem* item = frame()->loader()->history()->provisionalItem())
+    if (HistoryItem* item = frame()->loader().history()->provisionalItem())
         return WebHistoryItem(item);
-    return WebHistoryItem(frame()->page()->mainFrame()->loader()->history()->currentItem());
+    return WebHistoryItem(frame()->page()->mainFrame()->loader().history()->currentItem());
 }
 
 void WebFrameImpl::enableViewSourceMode(bool enable)
 {
     if (frame())
         frame()->setInViewSourceMode(enable);
 }
 
 bool WebFrameImpl::isViewSourceModeEnabled() const
 {
     if (!frame())
         return false;
     return frame()->inViewSourceMode();
 }
 
 void WebFrameImpl::setReferrerForRequest(WebURLRequest& request, const WebURL& referrerURL)
 {
-    String referrer = referrerURL.isEmpty() ? frame()->loader()->outgoingReferrer() : String(referrerURL.spec().utf16());
+    String referrer = referrerURL.isEmpty() ? frame()->loader().outgoingReferrer() : String(referrerURL.spec().utf16());
     referrer = SecurityPolicy::generateReferrerHeader(frame()->document()->referrerPolicy(), request.url(), referrer);
     if (referrer.isEmpty())
         return;
     request.setHTTPHeaderField(WebString::fromUTF8("Referer"), referrer);
 }
 
 void WebFrameImpl::dispatchWillSendRequest(WebURLRequest& request)
 {
     ResourceResponse response;
-    frame()->loader()->client()->dispatchWillSendRequest(0, 0, request.toMutableResourceRequest(), response);
+    frame()->loader().client()->dispatchWillSendRequest(0, 0, request.toMutableResourceRequest(), response);
 }
 
 WebURLLoader* WebFrameImpl::createAssociatedURLLoader(const WebURLLoaderOptions& options)
 {
     return new AssociatedURLLoader(this, options);
 }
 
 unsigned WebFrameImpl::unloadListenerCount() const
 {
     return frame()->domWindow()->pendingUnloadEventListeners();
 }
 
 bool WebFrameImpl::willSuppressOpenerInNewFrame() const
 {
-    return frame()->loader()->suppressOpenerInNewFrame();
+    return frame()->loader().suppressOpenerInNewFrame();
 }
 
 void WebFrameImpl::replaceSelection(const WebString& text)
 {
     bool selectReplacement = false;
     bool smartReplace = true;
     frame()->editor().replaceSelectionWithText(text, selectReplacement, smartReplace);
 }
 
 void WebFrameImpl::insertText(const WebString& text)
@@ skipping 1111 matching lines @@
     // onload event handler.
     // Because the event handler may set webframe->mFrame to null,
     // it is necessary to check the value after calling init() and
     // return without loading URL.
     // NOTE: m_client will be null if this frame has been detached.
     // (b:791612)
     childFrame->init(); // create an empty document
     if (!childFrame->tree().parent())
         return 0;
 
-    HistoryItem* parentItem = frame()->loader()->history()->currentItem();
+    HistoryItem* parentItem = frame()->loader().history()->currentItem();
     HistoryItem* childItem = 0;
     // If we're moving in the back/forward list, we might want to replace the content
     // of this child frame with whatever was there at that point.
-    if (parentItem && parentItem->children().size() && isBackForwardLoadType(frame()->loader()->loadType()) && !frame()->document()->loadEventFinished())
+    if (parentItem && parentItem->children().size() && isBackForwardLoadType(frame()->loader().loadType()) && !frame()->document()->loadEventFinished())
         childItem = parentItem->childItemWithTarget(childFrame->tree().uniqueName());
 
     if (childItem)
-        childFrame->loader()->loadHistoryItem(childItem);
+        childFrame->loader().loadHistoryItem(childItem);
     else
-        childFrame->loader()->load(FrameLoadRequest(0, request.resourceRequest(), "_self"));
+        childFrame->loader().load(FrameLoadRequest(0, request.resourceRequest(), "_self"));
 
     // A synchronous navigation (about:blank) would have already processed
     // onload, so it is possible for the frame to have already been destroyed by
     // script in the page.
     // NOTE: m_client will be null if this frame has been detached.
     if (!childFrame->tree().parent())
         return 0;
 
     return childFrame.release();
 }
@@ skipping 25 matching lines @@
     frame()->view()->setInputEventsScaleFactorForEmulation(m_inputEventsScaleFactorForEmulation);
 
     if (isMainFrame)
         webView->suppressInvalidations(false);
 }
 
 WebFrameImpl* WebFrameImpl::fromFrame(Frame* frame)
 {
     if (!frame)
         return 0;
-    return toFrameLoaderClientImpl(frame->loader()->client())->webFrame();
+    return toFrameLoaderClientImpl(frame->loader().client())->webFrame();
 }
 
 WebFrameImpl* WebFrameImpl::fromFrameOwnerElement(Element* element)
 {
     // FIXME: Why do we check specifically for <iframe> and <frame> here? Why can't we get the WebFrameImpl from an <object> element, for example.
     if (!element || !element->isFrameOwnerElement() || (!element->hasTagName(HTMLNames::iframeTag) && !element->hasTagName(HTMLNames::frameTag)))
         return 0;
     return fromFrame(toHTMLFrameOwnerElement(element)->contentFrame());
 }
 
@@ skipping 252 matching lines @@
 
         // There is a possibility that the frame being detached was the only
         // pending one. We need to make sure final replies can be sent.
         flushCurrentScopingEffort(m_findRequestIdentifier);
 
         cancelPendingScopingEffort();
     }
 }
 
 } // namespace WebKit