Changeset 80768 in webkit

Timestamp:

Mar 10, 2011 2:54:13 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-03-10 Caio Marcelo de Oliveira Filho <​caio.oliveira@openbossa.org>

Reviewed by Antonio Gomes.

Simplify how QWebFrame::requestedUrl() is obtained
​https://bugs.webkit.org/show_bug.cgi?id=55842

When a load starts, store the requested URL until we know that it'll be
available for us in the document loader -- after load finished.

The existing auto tests cover the three different code paths in
requestedUrl() and the new code passes the autotests. In each of those
cases, we looked for the information in a different place, but in all
of them, dispatchDidStartProvisionalLoad was called.

This simplification will be useful to fix bug 32723. The way requestedUrl()
is implementent, we can't use it as a fallback for url() when the setUrl()
was called with an invalid URL.

• Api/qwebframe.cpp: (QWebFrame::requestedUrl):
• WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::dispatchDidStartProvisionalLoad): (WebCore::FrameLoaderClientQt::dispatchDidFinishLoad):
• WebCoreSupport/FrameLoaderClientQt.h: (WebCore::FrameLoaderClientQt::lastRequestedUrl):

Location:

trunk/Source/WebKit/qt

Files:

• Api/qwebframe.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientQt.cpp (modified) (2 diffs)
• WebCoreSupport/FrameLoaderClientQt.h (modified) (2 diffs)

trunk/Source/WebKit/qt/Api/qwebframe.cpp

@@ -781 +781 @@
 QUrl QWebFrame::requestedUrl() const
 {
-    // There are some possible edge cases to be handled here,
-    // apart from checking if activeDocumentLoader is valid:
-    //
-    // * Method can be called while processing an unsucessful load.
-    //   In this case, frameLoaderClient will hold the current error
-    //   (m_loadError), and we will make use of it to recover the 'failingURL'.
-    // * If the 'failingURL' holds a null'ed string though, we fallback
-    //   to 'outgoingReferrer' (it yet is safer than originalRequest).
-    FrameLoader* loader = d->frame->loader();
-    FrameLoaderClientQt* loaderClient = d->frameLoaderClient;
-
-    if (!loader->activeDocumentLoader()
-        || !loaderClient->m_loadError.isNull()) {
-        if (!loaderClient->m_loadError.failingURL().isNull())
-            return QUrl(loaderClient->m_loadError.failingURL());
-        else if (!loader->outgoingReferrer().isEmpty())
-            return QUrl(loader->outgoingReferrer());
-    }
-
-    return loader->originalRequest().url();
+    const KURL& lastRequestedUrl = d->frameLoaderClient->lastRequestedUrl();
+    if (lastRequestedUrl.isValid())
+        return lastRequestedUrl;
+    return d->frame->loader()->originalRequest().url();
 }
 /*!

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-03-10  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        Reviewed by Antonio Gomes.
+
+        Simplify how QWebFrame::requestedUrl() is obtained
+        https://bugs.webkit.org/show_bug.cgi?id=55842
+
+        When a load starts, store the requested URL until we know that it'll be
+        available for us in the document loader -- after load finished.
+
+        The existing auto tests cover the three different code paths in
+        requestedUrl() and the new code passes the autotests. In each of those
+        cases, we looked for the information in a different place, but in all
+        of them, dispatchDidStartProvisionalLoad was called.
+
+        This simplification will be useful to fix bug 32723. The way requestedUrl()
+        is implementent, we can't use it as a fallback for url() when the setUrl()
+        was called with an invalid URL.
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::requestedUrl):
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::dispatchDidStartProvisionalLoad):
+        (WebCore::FrameLoaderClientQt::dispatchDidFinishLoad):
+        * WebCoreSupport/FrameLoaderClientQt.h:
+        (WebCore::FrameLoaderClientQt::lastRequestedUrl):
+
 2011-03-10  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 

trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -438 +438 @@
         printf("%s - in didStartProvisionalLoadForFrame\n", qPrintable(drtPrintFrameUserGestureStatus(m_frame)));
 
+    m_lastRequestedUrl = m_frame->loader()->activeDocumentLoader()->requestURL();
+
     if (m_webFrame)
         emit m_webFrame->provisionalLoad();
@@ -517 +519 @@
     // Clears the previous error.
     m_loadError = ResourceError();
+
+    // The requested URL will be available in the document loader that just finished, so we
+    // don't need to keep it anymore.
+    m_lastRequestedUrl = KURL();
 
     if (!m_webFrame)

trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h

@@ -240 +240 @@
     virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext();
 
+    const KURL& lastRequestedUrl() const { return m_lastRequestedUrl; }
+
     static bool dumpFrameLoaderCallbacks;
     static bool dumpUserGestureInFrameLoaderCallbacks;
@@ -268 +270 @@
     bool m_hasRepresentation;
 
+    KURL m_lastRequestedUrl;
     ResourceError m_loadError;
 };