Diff
Modified: trunk/Source/WebCore/ChangeLog (89078 => 89079)
--- trunk/Source/WebCore/ChangeLog 2011-06-16 23:10:49 UTC (rev 89078)
+++ trunk/Source/WebCore/ChangeLog 2011-06-16 23:15:10 UTC (rev 89079)
@@ -1,3 +1,24 @@
+2011-06-16 Eric Seidel <[email protected]>
+
+ 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 <[email protected]>
Reviewed by Antonio Gomes.
Modified: trunk/Source/WebCore/WebCore.exp.in (89078 => 89079)
--- trunk/Source/WebCore/WebCore.exp.in 2011-06-16 23:10:49 UTC (rev 89078)
+++ trunk/Source/WebCore/WebCore.exp.in 2011-06-16 23:15:10 UTC (rev 89079)
@@ -159,7 +159,6 @@
__ZN7WebCore11FileChooser10iconLoadedEN3WTF10PassRefPtrINS_4IconEEE
__ZN7WebCore11FileChooser11chooseFilesERKN3WTF6VectorINS1_6StringELm0EEE
__ZN7WebCore11FileChooserD1Ev
-__ZN7WebCore11FrameLoader11completeURLERKN3WTF6StringE
__ZN7WebCore11FrameLoader11loadArchiveEN3WTF10PassRefPtrINS_7ArchiveEEE
__ZN7WebCore11FrameLoader11shouldCloseEv
__ZN7WebCore11FrameLoader11urlSelectedERKNS_4KURLERKN3WTF6StringENS4_10PassRefPtrINS_5EventEEEbbNS_14ReferrerPolicyE
Modified: trunk/Source/WebCore/bindings/generic/GenericBinding.h (89078 => 89079)
--- trunk/Source/WebCore/bindings/generic/GenericBinding.h 2011-06-16 23:10:49 UTC (rev 89078)
+++ trunk/Source/WebCore/bindings/generic/GenericBinding.h 2011-06-16 23:15:10 UTC (rev 89079)
@@ -31,6 +31,7 @@
#ifndef GenericBinding_h
#define GenericBinding_h
+#include "Document.h"
#include "Frame.h"
#include "FrameLoader.h"
@@ -58,7 +59,7 @@
Frame* frame = state->firstFrame();
if (!frame)
return KURL();
- return frame->loader()->completeURL(relativeURL);
+ return frame->document()->completeURL(relativeURL);
}
}
Modified: trunk/Source/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp (89078 => 89079)
--- trunk/Source/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp 2011-06-16 23:10:49 UTC (rev 89078)
+++ trunk/Source/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp 2011-06-16 23:15:10 UTC (rev 89079)
@@ -49,7 +49,7 @@
Frame* frame = asJSDOMWindow(exec->dynamicGlobalObject())->impl()->frame();
if (!frame)
return jsUndefined();
- const KURL& url = ""
+ const KURL& url = ""
ExceptionCode ec = 0;
bool result = impl()->hasItem(url, ec);
@@ -62,8 +62,8 @@
Frame* frame = asJSDOMWindow(exec->dynamicGlobalObject())->impl()->frame();
if (!frame)
return jsUndefined();
- const KURL& url = ""
-
+ const KURL& url = ""
+
ExceptionCode ec = 0;
impl()->add(url, ec);
setDOMException(exec, ec);
@@ -75,8 +75,8 @@
Frame* frame = asJSDOMWindow(exec->dynamicGlobalObject())->impl()->frame();
if (!frame)
return jsUndefined();
- const KURL& url = ""
-
+ const KURL& url = ""
+
ExceptionCode ec = 0;
impl()->remove(url, ec);
setDOMException(exec, ec);
Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (89078 => 89079)
--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2011-06-16 23:10:49 UTC (rev 89078)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2011-06-16 23:15:10 UTC (rev 89079)
@@ -59,7 +59,7 @@
m_serviceType = mimeTypeFromDataURL(m_url);
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;
}
@@ -95,12 +95,12 @@
{
ASSERT(document());
ASSERT(document()->frame());
- FrameLoader* frameLoader = document()->frame()->loader();
- ASSERT(frameLoader);
KURL completedURL;
if (!url.isEmpty())
- completedURL = frameLoader->completeURL(url);
+ completedURL = document()->completeURL(url);
+ FrameLoader* frameLoader = document()->frame()->loader();
+ ASSERT(frameLoader);
if (frameLoader->client()->objectContentType(completedURL, serviceType, shouldPreferPlugInsForImages()) == ObjectContentNetscapePlugin)
return true;
return false;
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (89078 => 89079)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2011-06-16 23:10:49 UTC (rev 89078)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2011-06-16 23:15:10 UTC (rev 89079)
@@ -317,7 +317,8 @@
frame = mainFrame;
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);
}
static PassRefPtr<InspectorObject> buildObjectForCookie(const Cookie& cookie)
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (89078 => 89079)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2011-06-16 23:10:49 UTC (rev 89078)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2011-06-16 23:15:10 UTC (rev 89079)
@@ -788,18 +788,6 @@
m_frame->document()->implicitClose();
}
-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)
{
ASSERT(childFrame);
Modified: trunk/Source/WebCore/loader/FrameLoader.h (89078 => 89079)
--- trunk/Source/WebCore/loader/FrameLoader.h 2011-06-16 23:10:49 UTC (rev 89078)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2011-06-16 23:15:10 UTC (rev 89079)
@@ -219,8 +219,6 @@
void didEndDocument();
void willSetEncoding();
- KURL baseURL() const;
-
void handledOnloadEvents();
String userAgent(const KURL&) const;
@@ -260,8 +258,6 @@
bool isComplete() const;
- KURL completeURL(const String& url);
-
void cancelAndClear();
void setTitle(const StringWithDirection&);
Modified: trunk/Source/WebCore/loader/NavigationScheduler.cpp (89078 => 89079)
--- trunk/Source/WebCore/loader/NavigationScheduler.cpp 2011-06-16 23:10:49 UTC (rev 89078)
+++ trunk/Source/WebCore/loader/NavigationScheduler.cpp 2011-06-16 23:15:10 UTC (rev 89079)
@@ -335,12 +335,12 @@
lockBackForwardList = lockBackForwardList || mustLockBackForwardList(m_frame);
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;
}
Modified: trunk/Source/WebCore/page/History.cpp (89078 => 89079)
--- trunk/Source/WebCore/page/History.cpp 2011-06-16 23:10:49 UTC (rev 89078)
+++ trunk/Source/WebCore/page/History.cpp 2011-06-16 23:15:10 UTC (rev 89079)
@@ -109,10 +109,10 @@
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);
}
Modified: trunk/Source/WebCore/plugins/PluginView.cpp (89078 => 89079)
--- trunk/Source/WebCore/plugins/PluginView.cpp 2011-06-16 23:10:49 UTC (rev 89078)
+++ trunk/Source/WebCore/plugins/PluginView.cpp 2011-06-16 23:15:10 UTC (rev 89079)
@@ -829,7 +829,7 @@
, m_element(element)
, 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)
, m_invalidateTimer(this, &PluginView::invalidateTimerFired)
Modified: trunk/Source/WebKit/chromium/src/WebPasswordFormData.cpp (89078 => 89079)
--- trunk/Source/WebKit/chromium/src/WebPasswordFormData.cpp 2011-06-16 23:10:49 UTC (rev 89078)
+++ trunk/Source/WebKit/chromium/src/WebPasswordFormData.cpp 2011-06-16 23:15:10 UTC (rev 89079)
@@ -150,11 +150,6 @@
WebPasswordFormData::WebPasswordFormData(const WebFormElement& webForm)
{
RefPtr<HTMLFormElement> form = webForm.operator PassRefPtr<HTMLFormElement>();
-
- Frame* frame = form->document()->frame();
- if (!frame)
- return;
-
PasswordFormFields fields;
findPasswordFormFields(form.get(), &fields);
@@ -165,7 +160,7 @@
String action = ""
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;
Modified: trunk/Source/WebKit/chromium/src/WebSearchableFormData.cpp (89078 => 89079)
--- trunk/Source/WebKit/chromium/src/WebSearchableFormData.cpp 2011-06-16 23:10:49 UTC (rev 89078)
+++ trunk/Source/WebKit/chromium/src/WebSearchableFormData.cpp 2011-06-16 23:15:10 UTC (rev 89079)
@@ -70,8 +70,10 @@
// Returns true if the submit request results in an HTTP URL.
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");
}
// If the form does not have an activated submit button, the first submit
@@ -236,10 +238,6 @@
WebSearchableFormData::WebSearchableFormData(const WebFormElement& form, const WebInputElement& selectedInputElement)
{
RefPtr<HTMLFormElement> formElement = form.operator PassRefPtr<HTMLFormElement>();
- const Frame* frame = formElement->document()->frame();
- if (!frame)
- return;
-
HTMLInputElement* inputElement = selectedInputElement.operator PassRefPtr<HTMLInputElement>().get();
// Only consider forms that GET data.
@@ -287,7 +285,7 @@
return;
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());
m_url = url;
Modified: trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm (89078 => 89079)
--- trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm 2011-06-16 23:10:49 UTC (rev 89078)
+++ trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm 2011-06-16 23:15:10 UTC (rev 89079)
@@ -954,7 +954,7 @@
if (!frame->document()->securityOrigin()->canAccess(targetFrame->document()->securityOrigin()))
return CString();
- KURL absoluteURL = targetFrame->loader()->completeURL(relativeURLString);
+ KURL absoluteURL = targetFrame->document()->completeURL(relativeURLString);
return absoluteURL.string().utf8();
}
