[webkit-changes] [90760] trunk/Source/WebKit2

Mon, 11 Jul 2011 09:58:03 -0700

Title: [90760] trunk/Source/WebKit2
Revision
90760
Author
[email protected]
Date
2011-07-11 09:57:57 -0700 (Mon, 11 Jul 2011)

Log Message

        The original request should be accessible from WebNavigationData.
        https://bugs.webkit.org/show_bug.cgi?id=64227

        Reviewed by Anders Carlsson.

        * Shared/WebNavigationDataStore.h:
        (WebKit::WebNavigationDataStore::encode): Handle the encoding of the original request.
        (WebKit::WebNavigationDataStore::decode): Handle the decoding of the original request.
        * UIProcess/API/C/WKNavigationData.cpp:
        (WKNavigationDataCopyOriginalRequest): 
        * UIProcess/API/C/WKNavigationData.h:
        * UIProcess/WebNavigationData.h:
        (WebKit::WebNavigationData::originalRequest):
        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
        (WebKit::WebFrameLoaderClient::updateGlobalHistory): Store the original request in the WebNavigationDataStore.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (90759 => 90760)


--- trunk/Source/WebKit2/ChangeLog	2011-07-11 16:52:02 UTC (rev 90759)
+++ trunk/Source/WebKit2/ChangeLog	2011-07-11 16:57:57 UTC (rev 90760)
@@ -1,3 +1,21 @@
+2011-07-11  Ada Chan  <[email protected]>
+
+        The original request should be accessible from WebNavigationData.
+        https://bugs.webkit.org/show_bug.cgi?id=64227
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/WebNavigationDataStore.h:
+        (WebKit::WebNavigationDataStore::encode): Handle the encoding of the original request.
+        (WebKit::WebNavigationDataStore::decode): Handle the decoding of the original request.
+        * UIProcess/API/C/WKNavigationData.cpp:
+        (WKNavigationDataCopyOriginalRequest): 
+        * UIProcess/API/C/WKNavigationData.h:
+        * UIProcess/WebNavigationData.h:
+        (WebKit::WebNavigationData::originalRequest):
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::updateGlobalHistory): Store the original request in the WebNavigationDataStore.
+
 2011-07-11  Benjamin Poulain  <[email protected]>
 
         [Qt][WK2] Forward the viewport visible area from the view instead of inferring it from the TiledDrawingAreaProxy

Modified: trunk/Source/WebKit2/Shared/WebNavigationDataStore.h (90759 => 90760)


--- trunk/Source/WebKit2/Shared/WebNavigationDataStore.h	2011-07-11 16:52:02 UTC (rev 90759)
+++ trunk/Source/WebKit2/Shared/WebNavigationDataStore.h	2011-07-11 16:57:57 UTC (rev 90760)
@@ -29,6 +29,7 @@
 #include "ArgumentDecoder.h"
 #include "ArgumentEncoder.h"
 #include "WebCoreArgumentCoders.h"
+#include <WebCore/ResourceRequest.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebKit {
@@ -38,6 +39,7 @@
     {
         encoder->encode(url);
         encoder->encode(title);
+        encoder->encode(originalRequest);
     }
 
     static bool decode(CoreIPC::ArgumentDecoder* decoder, WebNavigationDataStore& store)
@@ -46,12 +48,15 @@
             return false;
         if (!decoder->decode(store.title))
             return false;
+        if (!decoder->decode(store.originalRequest))
+            return false;
         return true;
     }
 
     // FIXME: Add the remaining items we want to track for history.
     String url;
     String title;
+    WebCore::ResourceRequest originalRequest;
 };
 
 } // namespace WebKit

Modified: trunk/Source/WebKit2/UIProcess/API/C/WKNavigationData.cpp (90759 => 90760)


--- trunk/Source/WebKit2/UIProcess/API/C/WKNavigationData.cpp	2011-07-11 16:52:02 UTC (rev 90759)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKNavigationData.cpp	2011-07-11 16:57:57 UTC (rev 90760)
@@ -28,6 +28,7 @@
 
 #include "WKAPICast.h"
 #include "WebNavigationData.h"
+#include "WebURLRequest.h"
 
 using namespace WebKit;
 
@@ -45,3 +46,8 @@
 {
     return toCopiedURLAPI(toImpl(navigationDataRef)->url());
 }
+
+WKURLRequestRef WKNavigationDataCopyOriginalRequest(WKNavigationDataRef navigationData)
+{
+    return toAPI(WebURLRequest::create(toImpl(navigationData)->originalRequest()).leakRef());
+}

Modified: trunk/Source/WebKit2/UIProcess/API/C/WKNavigationData.h (90759 => 90760)


--- trunk/Source/WebKit2/UIProcess/API/C/WKNavigationData.h	2011-07-11 16:52:02 UTC (rev 90759)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKNavigationData.h	2011-07-11 16:57:57 UTC (rev 90760)
@@ -36,6 +36,7 @@
 
 WK_EXPORT WKStringRef WKNavigationDataCopyTitle(WKNavigationDataRef navigationData);
 WK_EXPORT WKURLRef WKNavigationDataCopyURL(WKNavigationDataRef navigationData);
+WK_EXPORT WKURLRequestRef WKNavigationDataCopyOriginalRequest(WKNavigationDataRef navigationData);
 
 #ifdef __cplusplus
 }

Modified: trunk/Source/WebKit2/UIProcess/WebNavigationData.h (90759 => 90760)


--- trunk/Source/WebKit2/UIProcess/WebNavigationData.h	2011-07-11 16:52:02 UTC (rev 90759)
+++ trunk/Source/WebKit2/UIProcess/WebNavigationData.h	2011-07-11 16:57:57 UTC (rev 90760)
@@ -45,6 +45,7 @@
 
     String title() const { return m_store.title; }
     String url() const { return m_store.url; }
+    const WebCore::ResourceRequest& originalRequest() const { return m_store.originalRequest; }
 
 private:
     WebNavigationData(const WebNavigationDataStore&);

Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (90759 => 90760)


--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp	2011-07-11 16:52:02 UTC (rev 90759)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp	2011-07-11 16:57:57 UTC (rev 90760)
@@ -870,6 +870,7 @@
     data.url = ""
     // FIXME: use direction of title.
     data.title = loader->title().string();
+    data.originalRequest = loader->originalRequestCopy();
 
     WebProcess::shared().connection()->send(Messages::WebContext::DidNavigateWithNavigationData(webPage->pageID(), data, m_frame->frameID()), 0);
 }

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to