Changeset 89079 in webkit

Timestamp:

Jun 16, 2011 4:15:10 PM (13 years ago)

Author:

eric@webkit.org

Message:

2011-06-16 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

FrameLoader doesn't need completeURL or baseURL
​https://bugs.webkit.org/show_bug.cgi?id=62818

No functional change, thus no tests.

• html/HTMLPlugInImageElement.cpp: (WebCore::HTMLPlugInImageElement::isImageType): (WebCore::HTMLPlugInImageElement::wouldLoadAsNetscapePlugin):
• inspector/InspectorPageAgent.cpp: (WebCore::InspectorPageAgent::open):
• loader/FrameLoader.cpp:
• loader/FrameLoader.h:
• loader/NavigationScheduler.cpp: (WebCore::NavigationScheduler::scheduleLocationChange):
• page/History.cpp: (WebCore::History::urlForState):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/bindings/generic/GenericBinding.h (modified) (2 diffs)
• WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp (modified) (3 diffs)
• WebCore/html/HTMLPlugInImageElement.cpp (modified) (2 diffs)
• WebCore/inspector/InspectorPageAgent.cpp (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (1 diff)
• WebCore/loader/FrameLoader.h (modified) (2 diffs)
• WebCore/loader/NavigationScheduler.cpp (modified) (1 diff)
• WebCore/page/History.cpp (modified) (1 diff)
• WebCore/plugins/PluginView.cpp (modified) (1 diff)
• WebKit/chromium/src/WebPasswordFormData.cpp (modified) (2 diffs)
• WebKit/chromium/src/WebSearchableFormData.cpp (modified) (3 diffs)
• WebKit/mac/Plugins/WebBaseNetscapePluginView.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-16  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        FrameLoader doesn't need completeURL or baseURL
+        https://bugs.webkit.org/show_bug.cgi?id=62818
+
+        No functional change, thus no tests.
+
+        * html/HTMLPlugInImageElement.cpp:
+        (WebCore::HTMLPlugInImageElement::isImageType):
+        (WebCore::HTMLPlugInImageElement::wouldLoadAsNetscapePlugin):
+        * inspector/InspectorPageAgent.cpp:
+        (WebCore::InspectorPageAgent::open):
+        * loader/FrameLoader.cpp:
+        * loader/FrameLoader.h:
+        * loader/NavigationScheduler.cpp:
+        (WebCore::NavigationScheduler::scheduleLocationChange):
+        * page/History.cpp:
+        (WebCore::History::urlForState):
+
 2011-06-16  Dawit Alemayehu  <adawit@kde.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -160 +160 @@
 __ZN7WebCore11FileChooser11chooseFilesERKN3WTF6VectorINS1_6StringELm0EEE
 __ZN7WebCore11FileChooserD1Ev
-__ZN7WebCore11FrameLoader11completeURLERKN3WTF6StringE
 __ZN7WebCore11FrameLoader11loadArchiveEN3WTF10PassRefPtrINS_7ArchiveEEE
 __ZN7WebCore11FrameLoader11shouldCloseEv

trunk/Source/WebCore/bindings/generic/GenericBinding.h

@@ -32 +32 @@
 #define GenericBinding_h
 
+#include "Document.h"
 #include "Frame.h"
 #include "FrameLoader.h"
@@ -59 +60 @@
     if (!frame)
         return KURL();
-    return frame->loader()->completeURL(relativeURL);
+    return frame->document()->completeURL(relativeURL);
 }
 

trunk/Source/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp

@@ -50 +50 @@
     if (!frame)
         return jsUndefined();
-    const KURL& url = frame->loader()->completeURL(exec->argument(0).toString(exec));
+    const KURL& url = frame->document()->completeURL(exec->argument(0).toString(exec));
 
     ExceptionCode ec = 0;
@@ -63 +63 @@
     if (!frame)
         return jsUndefined();
-    const KURL& url = frame->loader()->completeURL(exec->argument(0).toString(exec));
-    
+    const KURL& url = frame->document()->completeURL(exec->argument(0).toString(exec));
+
     ExceptionCode ec = 0;
     impl()->add(url, ec);
@@ -76 +76 @@
     if (!frame)
         return jsUndefined();
-    const KURL& url = frame->loader()->completeURL(exec->argument(0).toString(exec));
-    
+    const KURL& url = frame->document()->completeURL(exec->argument(0).toString(exec));
+
     ExceptionCode ec = 0;
     impl()->remove(url, ec);

trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

@@ -60 +60 @@
 
     if (Frame* frame = document()->frame()) {
-        KURL completedURL = frame->loader()->completeURL(m_url);
+        KURL completedURL = document()->completeURL(m_url);
         return frame->loader()->client()->objectContentType(completedURL, m_serviceType, shouldPreferPlugInsForImages()) == ObjectContentImage;
     }
@@ -96 +96 @@
     ASSERT(document());
     ASSERT(document()->frame());
+    KURL completedURL;
+    if (!url.isEmpty())
+        completedURL = document()->completeURL(url);
+
     FrameLoader* frameLoader = document()->frame()->loader();
     ASSERT(frameLoader);
-    KURL completedURL;
-    if (!url.isEmpty())
-        completedURL = frameLoader->completeURL(url);
-
     if (frameLoader->client()->objectContentType(completedURL, serviceType, shouldPreferPlugInsForImages()) == ObjectContentNetscapePlugin)
         return true;

trunk/Source/WebCore/inspector/InspectorPageAgent.cpp

@@ -318 +318 @@
 
     UserGestureIndicator indicator(DefinitelyProcessingUserGesture);
-    frame->loader()->changeLocation(mainFrame->document()->securityOrigin(), frame->loader()->completeURL(url), "", false, false);
+    // FIXME: Why does one use mainFrame and the other frame?
+    frame->loader()->changeLocation(mainFrame->document()->securityOrigin(), frame->document()->completeURL(url), "", false, false);
 }
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -789 +789 @@
 }
 
-KURL FrameLoader::baseURL() const
-{
-    ASSERT(m_frame->document());
-    return m_frame->document()->baseURL();
-}
-
-KURL FrameLoader::completeURL(const String& url)
-{
-    ASSERT(m_frame->document());
-    return m_frame->document()->completeURL(url);
-}
-
 void FrameLoader::loadURLIntoChildFrame(const KURL& url, const String& referer, Frame* childFrame)
 {

trunk/Source/WebCore/loader/FrameLoader.h

@@ -220 +220 @@
     void willSetEncoding();
 
-    KURL baseURL() const;
-
     void handledOnloadEvents();
     String userAgent(const KURL&) const;
@@ -260 +258 @@
 
     bool isComplete() const;
-
-    KURL completeURL(const String& url);
 
     void cancelAndClear();

trunk/Source/WebCore/loader/NavigationScheduler.cpp

@@ -336 +336 @@
 
     FrameLoader* loader = m_frame->loader();
-    
+
     // If the URL we're going to navigate to is the same as the current one, except for the
     // fragment part, we don't need to schedule the location change.
     KURL parsedURL(ParsedURLString, url);
     if (parsedURL.hasFragmentIdentifier() && equalIgnoringFragmentIdentifier(m_frame->document()->url(), parsedURL)) {
-        loader->changeLocation(securityOrigin, loader->completeURL(url), referrer, lockHistory, lockBackForwardList);
+        loader->changeLocation(securityOrigin, m_frame->document()->completeURL(url), referrer, lockHistory, lockBackForwardList);
         return;
     }

trunk/Source/WebCore/page/History.cpp

@@ -110 +110 @@
 KURL History::urlForState(const String& urlString)
 {
-    KURL baseURL = m_frame->loader()->baseURL();
+    KURL baseURL = m_frame->document()->baseURL();
     if (urlString.isEmpty())
         return baseURL;
-        
+
     return KURL(baseURL, urlString);
 }

trunk/Source/WebCore/plugins/PluginView.cpp

@@ -830 +830 @@
     , m_isStarted(false)
     , m_url(url)
-    , m_baseURL(m_parentFrame->loader()->completeURL(m_parentFrame->document()->baseURL().string()))
+    , m_baseURL(m_parentFrame->document()->baseURL()) // FIXME: No need for this member variable!
     , m_status(PluginStatusLoadedSuccessfully)
     , m_requestTimer(this, &PluginView::requestTimerFired)

trunk/Source/WebKit/chromium/src/WebPasswordFormData.cpp

@@ -151 +151 @@
 {
     RefPtr<HTMLFormElement> form = webForm.operator PassRefPtr<HTMLFormElement>();
-
-    Frame* frame = form->document()->frame();
-    if (!frame)
-        return;
-
     PasswordFormFields fields;
     findPasswordFormFields(form.get(), &fields);
@@ -166 +161 @@
     if (action.isNull())
         action = ""; // missing 'action' attribute implies current URL
-    KURL fullAction = frame->loader()->completeURL(action);
+    KURL fullAction = form->document()->completeURL(action);
     if (!fullAction.isValid())
         return;

trunk/Source/WebKit/chromium/src/WebSearchableFormData.cpp

@@ -71 +71 @@
 bool IsHTTPFormSubmit(const HTMLFormElement* form)
 {
+    // FIXME: This function is insane. This is an overly complicated way to get this information.
     String action(form->action());
-    return form->document()->frame()->loader()->completeURL(action.isNull() ? "" : action).protocol() == "http";
+    // The isNull() check is trying to avoid completeURL returning KURL() when passed a null string.
+    return form->document()->completeURL(action.isNull() ? "" : action).protocolIs("http");
 }
 
@@ -237 +239 @@
 {
     RefPtr<HTMLFormElement> formElement = form.operator PassRefPtr<HTMLFormElement>();
-    const Frame* frame = formElement->document()->frame();
-    if (!frame)
-        return;
-
     HTMLInputElement* inputElement = selectedInputElement.operator PassRefPtr<HTMLInputElement>().get();
 
@@ -288 +286 @@
 
     String action(formElement->action());
-    KURL url(frame->loader()->completeURL(action.isNull() ? "" : action));
+    KURL url(formElement->document()->completeURL(action.isNull() ? "" : action));
     RefPtr<FormData> formData = FormData::create(encodedString);
     url.setQuery(formData->flattenToString());

trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm

@@ -955 +955 @@
         return CString();
   
-    KURL absoluteURL = targetFrame->loader()->completeURL(relativeURLString);
+    KURL absoluteURL = targetFrame->document()->completeURL(relativeURLString);
     return absoluteURL.string().utf8();
 }