Changeset 77085 in webkit

Timestamp:

Jan 30, 2011 12:30:27 AM (13 years ago)

Author:

mjs@apple.com

Message:

2011-01-29 Maciej Stachowiak <​mjs@apple.com>

Reviewed by Geoffrey Garen.

Add WKPageCopyPendingAPIRequestURL API
​https://bugs.webkit.org/show_bug.cgi?id=53383

This API returns the last URL requested for load via API, if neither that load nor any
other load subsequently reaches the provisional state.

This is useful to be able to track loads initiated via the API

• UIProcess/API/C/WKPage.cpp: (WKPageCopyPendingAPIRequestURL): Retrieve the pending URL.
• UIProcess/API/C/WKPage.h:
• UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::loadURL): Set pending URL. (WebKit::WebPageProxy::loadURLRequest): ditto (WebKit::WebPageProxy::reload): ditto (WebKit::WebPageProxy::goForward): ditto (WebKit::WebPageProxy::goBack): ditto (WebKit::WebPageProxy::estimatedProgress): Assume the initial progress value when there is a pending URL. (WebKit::WebPageProxy::didStartProvisionalLoadForFrame): Clear pending URL; clients should look at the provisional URL now. (WebKit::WebPageProxy::decidePolicyForNavigationAction): Clear pending URL if it doesn't match the policy URL; this means we were interrupted by another load.
• UIProcess/WebPageProxy.h: (WebKit::WebPageProxy::pendingAPIRequestURL): Helper function. (WebKit::WebPageProxy::clearPendingAPIRequestURL): ditto (WebKit::WebPageProxy::setPendingAPIRequestURL): ditto

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKPage.cpp (modified) (1 diff)
• UIProcess/API/C/WKPage.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (9 diffs)
• UIProcess/WebPageProxy.h (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-01-29  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Geoffrey Garen.
+
+        Add WKPageCopyPendingAPIRequestURL API
+        https://bugs.webkit.org/show_bug.cgi?id=53383
+
+        This API returns the last URL requested for load via API, if neither that load nor any
+        other load subsequently reaches the provisional state.
+        
+        This is useful to be able to track loads initiated via the API
+        
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageCopyPendingAPIRequestURL): Retrieve the pending URL.
+        * UIProcess/API/C/WKPage.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::loadURL): Set pending URL.
+        (WebKit::WebPageProxy::loadURLRequest): ditto
+        (WebKit::WebPageProxy::reload): ditto
+        (WebKit::WebPageProxy::goForward): ditto
+        (WebKit::WebPageProxy::goBack): ditto
+        (WebKit::WebPageProxy::estimatedProgress): Assume the initial
+        progress value when there is a pending URL.
+        (WebKit::WebPageProxy::didStartProvisionalLoadForFrame): Clear
+        pending URL; clients should look at the provisional URL now.
+        (WebKit::WebPageProxy::decidePolicyForNavigationAction): Clear
+        pending URL if it doesn't match the policy URL; this means we
+        were interrupted by another load.
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::pendingAPIRequestURL): Helper function.
+        (WebKit::WebPageProxy::clearPendingAPIRequestURL): ditto
+        (WebKit::WebPageProxy::setPendingAPIRequestURL): ditto
+
 2011-01-28  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

@@ -436 +436 @@
     toImpl(pageRef)->forceRepaint(VoidCallback::create(context, callback));
 }
+
+WK_EXPORT WKURLRef WKPageCopyPendingAPIRequestURL(WKPageRef pageRef)
+{
+    if (toImpl(pageRef)->pendingAPIRequestURL().isNull())
+        return 0;
+    return toCopiedURLAPI(toImpl(pageRef)->pendingAPIRequestURL());
+}

trunk/Source/WebKit2/UIProcess/API/C/WKPage.h

@@ -345 +345 @@
 WK_EXPORT void WKPageForceRepaint(WKPageRef page, void* context, WKPageForceRepaintFunction function);
 
+WK_EXPORT WKURLRef WKPageCopyPendingAPIRequestURL(WKPageRef page);
+
 #ifdef __cplusplus
 }

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -321 +321 @@
 void WebPageProxy::loadURL(const String& url)
 {
+    setPendingAPIRequestURL(url);
+
     if (!isValid())
         reattachToWebProcess();
@@ -331 +333 @@
 void WebPageProxy::loadURLRequest(WebURLRequest* urlRequest)
 {
+    setPendingAPIRequestURL(urlRequest->resourceRequest().url());
+
     if (!isValid())
         reattachToWebProcess();
@@ -374 +378 @@
 void WebPageProxy::reload(bool reloadFromOrigin)
 {
+    setPendingAPIRequestURL(m_backForwardList->currentItem()->url());
+
     if (!isValid()) {
         reattachToWebProcessWithItem(m_backForwardList->currentItem());
@@ -384 +390 @@
 void WebPageProxy::goForward()
 {
+    if (isValid() && !canGoForward())
+        return;
+
+    setPendingAPIRequestURL(m_backForwardList->forwardItem()->url());
+
     if (!isValid()) {
         reattachToWebProcessWithItem(m_backForwardList->forwardItem());
@@ -389 +400 @@
     }
 
-    if (!canGoForward())
-        return;
-
     process()->send(Messages::WebPage::GoForward(m_backForwardList->forwardItem()->itemID()), m_pageID);
 }
@@ -402 +410 @@
 void WebPageProxy::goBack()
 {
+    if (isValid() && !canGoBack())
+        return;
+
+    setPendingAPIRequestURL(m_backForwardList->backItem()->url());
+
     if (!isValid()) {
         reattachToWebProcessWithItem(m_backForwardList->backItem());
         return;
     }
-
-    if (!canGoBack())
-        return;
 
     process()->send(Messages::WebPage::GoBack(m_backForwardList->backItem()->itemID()), m_pageID);
@@ -1181 +1191 @@
 static const double initialProgressValue = 0.1;
 
+double WebPageProxy::estimatedProgress() const
+{
+    if (!pendingAPIRequestURL().isNull())
+        return initialProgressValue;
+    return m_estimatedProgress; 
+}
+
 void WebPageProxy::didStartProgress()
 {
@@ -1204 +1221 @@
 void WebPageProxy::didStartProvisionalLoadForFrame(uint64_t frameID, const String& url, bool loadingSubstituteDataForUnreachableURL, CoreIPC::ArgumentDecoder* arguments)
 {
+    clearPendingAPIRequestURL();
+
     RefPtr<APIObject> userData;
     WebContextUserMessageDecoder messageDecoder(userData, context());
@@ -1430 +1449 @@
 void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, uint32_t opaqueNavigationType, uint32_t opaqueModifiers, int32_t opaqueMouseButton, const String& url, uint64_t listenerID)
 {
+    if (url != pendingAPIRequestURL())
+        clearPendingAPIRequestURL();
+
     WebFrameProxy* frame = process()->webFrame(frameID);
     MESSAGE_CHECK(frame);

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -241 +241 @@
     String customTextEncodingName() const { return m_customTextEncodingName; }
 
-    double estimatedProgress() const { return m_estimatedProgress; }
+    double estimatedProgress() const;
 
     void terminateProcess();
@@ -372 +372 @@
     void drawPagesToPDF(WebFrameProxy*, uint32_t first, uint32_t count, PassRefPtr<DataCallback>);
 #endif
+
+    const String& pendingAPIRequestURL() const { return m_pendingAPIRequestURL; }
 
 private:
@@ -545 +547 @@
     static String standardUserAgent(const String& applicationName = String());
 
+    void clearPendingAPIRequestURL() { m_pendingAPIRequestURL = String(); }
+    void setPendingAPIRequestURL(const String& pendingAPIRequestURL) { m_pendingAPIRequestURL = pendingAPIRequestURL; }
+
     PageClient* m_pageClient;
     WebLoaderClient m_loaderClient;
@@ -644 +649 @@
     bool m_mainFrameHasCustomRepresentation;
     WebCore::DragOperation m_currentDragOperation;
+
+    String m_pendingAPIRequestURL;
 };