Changeset 82206 in webkit

Timestamp:

Mar 29, 2011 12:37:30 AM (13 years ago)

Author:

mjs@apple.com

Message:

2011-03-28 Maciej Stachowiak <​mjs@apple.com>

Reviewed by Dan Bernstein.

WKPageGetSourceForFrame and WKPageGetContentsAsString should throw an error in case of a race with page loading
​https://bugs.webkit.org/show_bug.cgi?id=57305
<rdar://problem/8738060>, <rdar://problem/8780168>

• UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::close): Clear m_loadDependentStringCallbackIDs (WebKit::WebPageProxy::getSourceForFrame): track the callback as load dependent (WebKit::WebPageProxy::getContentsAsString): ditto (WebKit::WebPageProxy::clearLoadDependentCallbacks): Invalidate all load dependent callbacks (WebKit::WebPageProxy::didCommitLoadForFrame): Call clearLoadDependentCallbacks (WebKit::WebPageProxy::didFailLoadForFrame): ditto (WebKit::WebPageProxy::stringCallback): Remove callback from load dependent set if appropriate (WebKit::WebPageProxy::processDidCrash): Clear m_loadDependentStringCallbackIDs
• UIProcess/WebPageProxy.h: Add m_loadDependentStringCallbackIDs hash set.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (8 diffs)
• UIProcess/WebPageProxy.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-03-28  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        WKPageGetSourceForFrame and WKPageGetContentsAsString should throw an error in case of a race with page loading
+        https://bugs.webkit.org/show_bug.cgi?id=57305
+        <rdar://problem/8738060>, <rdar://problem/8780168>
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::close): Clear m_loadDependentStringCallbackIDs
+        (WebKit::WebPageProxy::getSourceForFrame): track the callback as load dependent
+        (WebKit::WebPageProxy::getContentsAsString): ditto
+        (WebKit::WebPageProxy::clearLoadDependentCallbacks): Invalidate all load dependent callbacks
+        (WebKit::WebPageProxy::didCommitLoadForFrame): Call clearLoadDependentCallbacks
+        (WebKit::WebPageProxy::didFailLoadForFrame): ditto
+        (WebKit::WebPageProxy::stringCallback): Remove callback from load dependent set if appropriate
+        (WebKit::WebPageProxy::processDidCrash): Clear m_loadDependentStringCallbackIDs
+        * UIProcess/WebPageProxy.h: Add m_loadDependentStringCallbackIDs hash set.
+
 2011-03-28  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -324 +324 @@
     invalidateCallbackMap(m_dataCallbacks);
     invalidateCallbackMap(m_stringCallbacks);
+    m_loadDependentStringCallbackIDs.clear();
     invalidateCallbackMap(m_scriptValueCallbacks);
     invalidateCallbackMap(m_computedPagesCallbacks);
@@ -1116 +1117 @@
     RefPtr<StringCallback> callback = prpCallback;
     uint64_t callbackID = callback->callbackID();
+    m_loadDependentStringCallbackIDs.add(callbackID);
     m_stringCallbacks.set(callbackID, callback.get());
     process()->send(Messages::WebPage::GetSourceForFrame(frame->frameID(), callbackID), m_pageID);
@@ -1124 +1126 @@
     RefPtr<StringCallback> callback = prpCallback;
     uint64_t callbackID = callback->callbackID();
+    m_loadDependentStringCallbackIDs.add(callbackID);
     m_stringCallbacks.set(callbackID, callback.get());
     process()->send(Messages::WebPage::GetContentsAsString(callbackID), m_pageID);
@@ -1396 +1399 @@
 }
 
+void WebPageProxy::clearLoadDependentCallbacks()
+{
+    Vector<uint64_t> callbackIDsCopy;
+    copyToVector(m_loadDependentStringCallbackIDs, callbackIDsCopy);
+    m_loadDependentStringCallbackIDs.clear();
+
+    for (size_t i = 0; i < callbackIDsCopy.size(); ++i) {
+        RefPtr<StringCallback> callback = m_stringCallbacks.take(callbackIDsCopy[i]);
+        if (callback)
+            callback->invalidate();
+    }
+}
+
 void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, const String& mimeType, bool frameHasCustomRepresentation, const PlatformCertificateInfo& certificateInfo, CoreIPC::ArgumentDecoder* arguments)
 {
@@ -1410 +1426 @@
     MESSAGE_CHECK(frame);
 
+    clearLoadDependentCallbacks();
+
     frame->didCommitLoad(mimeType, certificateInfo);
 
@@ -1457 +1475 @@
     WebFrameProxy* frame = process()->webFrame(frameID);
     MESSAGE_CHECK(frame);
+
+    clearLoadDependentCallbacks();
 
     frame->didFailLoad();
@@ -2432 +2452 @@
     if (!callback) {
         // FIXME: Log error or assert.
-        return;
-    }
+        // this can validly happen if a load invalidated the callback, though
+        return;
+    }
+
+    m_loadDependentStringCallbackIDs.remove(callbackID);
 
     callback->performCallbackWithReturnValue(resultString.impl());
@@ -2556 +2579 @@
     invalidateCallbackMap(m_dataCallbacks);
     invalidateCallbackMap(m_stringCallbacks);
+    m_loadDependentStringCallbackIDs.clear();
     invalidateCallbackMap(m_scriptValueCallbacks);
     invalidateCallbackMap(m_computedPagesCallbacks);

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -657 +657 @@
 #endif
 
+    void clearLoadDependentCallbacks();
+
     PageClient* m_pageClient;
     WebLoaderClient m_loaderClient;
@@ -689 +691 @@
     HashMap<uint64_t, RefPtr<DataCallback> > m_dataCallbacks;
     HashMap<uint64_t, RefPtr<StringCallback> > m_stringCallbacks;
+    HashSet<uint64_t> m_loadDependentStringCallbackIDs;
     HashMap<uint64_t, RefPtr<ScriptValueCallback> > m_scriptValueCallbacks;
     HashMap<uint64_t, RefPtr<ComputedPagesCallback> > m_computedPagesCallbacks;