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

Thu, 09 Feb 2012 21:45:18 -0800

Title: [107356] trunk/Source/WebKit2
Revision
107356
Author
[email protected]
Date
2012-02-09 21:45:10 -0800 (Thu, 09 Feb 2012)

Log Message

ASSERTION FAILED: checkURLReceivedFromWebProcess(originalURL) loading a local file, if the WebProcess crashed
https://bugs.webkit.org/show_bug.cgi?id=70845
<rdar://problem/10269985>

Reviewed by Anders Carlsson.

This also fixes some case where WebProcess did not get a sandbox extension after a crash.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::reattachToWebProcessWithItem): We no longer need to pass a sandbox
extension here, we're now passing it at b/f navigation bottleneck.
(WebKit::WebPageProxy::reload): Pass a sandbox extension - reload may mean reloading an error
page after a crash, so WebProcess may no longer have the extension.
(WebKit::WebPageProxy::goForward): We no longer need to pass a sandbox extension here,
we're now passing it at b/f navigation bottleneck. Also, fixed a bug where we first null checked
a WebBackForwardListItem pointer, and then used it anyway.
(WebKit::WebPageProxy::goBack): Ditto.
(WebKit::WebPageProxy::goToBackForwardItem): Ditto.
(WebKit::WebPageProxy::backForwardGoToItem): This is the bottleneck. We get here both for UI
actions like pressing the Back button, and for window.history.go() navigations. JS navigations
previously didn't open up the sandbox. URLs in UI process b/f list are trusted, so it's
always OK to grant a sandbox extension if one of them is a file: one.

* UIProcess/WebPageProxy.h: backForwardGoToItem() now returns a sandbox extension handle.

* UIProcess/WebPageProxy.messages.in: Ditto.

* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::checkURLReceivedFromWebProcess): If a URL is in UI process b/f
list, then it has been already vetted as something the Web process knows about. No need to
crash if it actually attempts going there.
(WebKit::WebProcessProxy::didReceiveInvalidMessage): Removed a useless comment (we have tons
of fprintfs besides this one). Fixed log message syntax.

* UIProcess/cf/WebPageProxyCF.cpp: (WebKit::WebPageProxy::restoreFromSessionStateData):
We no longer need to pass a sandbox extension here, we're now passing it at b/f navigation
bottleneck.

* WebProcess/WebPage/WebBackForwardListProxy.cpp: (WebKit::WebBackForwardListProxy::goToItem):
We now get an extension here, when telling UI process that we're navigating to a b/f list item.

* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::reload): Use the extension we're getting.
(WebKit::WebPage::goForward): Don't use one we're not getting.
(WebKit::WebPage::goBack): Ditto.
(WebKit::WebPage::goToBackForwardItem): Ditto.
(WebKit::WebPage::restoreSessionAndNavigateToCurrentItem): Ditto.

* WebProcess/WebPage/WebPage.h: Adjusted signatures accordingly.

* WebProcess/WebPage/WebPage.messages.in: Ditto.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (107355 => 107356)


--- trunk/Source/WebKit2/ChangeLog	2012-02-10 05:42:55 UTC (rev 107355)
+++ trunk/Source/WebKit2/ChangeLog	2012-02-10 05:45:10 UTC (rev 107356)
@@ -1,3 +1,57 @@
+2012-02-09  Alexey Proskuryakov  <[email protected]>
+
+        ASSERTION FAILED: checkURLReceivedFromWebProcess(originalURL) loading a local file, if the WebProcess crashed
+        https://bugs.webkit.org/show_bug.cgi?id=70845
+        <rdar://problem/10269985>
+
+        Reviewed by Anders Carlsson.
+
+        This also fixes some case where WebProcess did not get a sandbox extension after a crash.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::reattachToWebProcessWithItem): We no longer need to pass a sandbox
+        extension here, we're now passing it at b/f navigation bottleneck.
+        (WebKit::WebPageProxy::reload): Pass a sandbox extension - reload may mean reloading an error
+        page after a crash, so WebProcess may no longer have the extension.
+        (WebKit::WebPageProxy::goForward): We no longer need to pass a sandbox extension here,
+        we're now passing it at b/f navigation bottleneck. Also, fixed a bug where we first null checked
+        a WebBackForwardListItem pointer, and then used it anyway.
+        (WebKit::WebPageProxy::goBack): Ditto.
+        (WebKit::WebPageProxy::goToBackForwardItem): Ditto.
+        (WebKit::WebPageProxy::backForwardGoToItem): This is the bottleneck. We get here both for UI
+        actions like pressing the Back button, and for window.history.go() navigations. JS navigations
+        previously didn't open up the sandbox. URLs in UI process b/f list are trusted, so it's
+        always OK to grant a sandbox extension if one of them is a file: one.
+
+        * UIProcess/WebPageProxy.h: backForwardGoToItem() now returns a sandbox extension handle.
+
+        * UIProcess/WebPageProxy.messages.in: Ditto.
+
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::checkURLReceivedFromWebProcess): If a URL is in UI process b/f
+        list, then it has been already vetted as something the Web process knows about. No need to
+        crash if it actually attempts going there.
+        (WebKit::WebProcessProxy::didReceiveInvalidMessage): Removed a useless comment (we have tons
+        of fprintfs besides this one). Fixed log message syntax.
+
+        * UIProcess/cf/WebPageProxyCF.cpp: (WebKit::WebPageProxy::restoreFromSessionStateData):
+        We no longer need to pass a sandbox extension here, we're now passing it at b/f navigation
+        bottleneck. 
+
+        * WebProcess/WebPage/WebBackForwardListProxy.cpp: (WebKit::WebBackForwardListProxy::goToItem):
+        We now get an extension here, when telling UI process that we're navigating to a b/f list item.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::reload): Use the extension we're getting.
+        (WebKit::WebPage::goForward): Don't use one we're not getting.
+        (WebKit::WebPage::goBack): Ditto.
+        (WebKit::WebPage::goToBackForwardItem): Ditto.
+        (WebKit::WebPage::restoreSessionAndNavigateToCurrentItem): Ditto.
+
+        * WebProcess/WebPage/WebPage.h: Adjusted signatures accordingly.
+
+        * WebProcess/WebPage/WebPage.messages.in: Ditto.
+
 2012-02-09  Matthew Delaney  <[email protected]>
 
         HiDPI: WebKit2's drag images are blurry

Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (107355 => 107356)


--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2012-02-10 05:42:55 UTC (rev 107355)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2012-02-10 05:45:10 UTC (rev 107356)
@@ -317,11 +317,7 @@
     if (!item)
         return;
 
-    SandboxExtension::Handle sandboxExtensionHandle;
-    bool createdExtension = maybeInitializeSandboxExtensionHandle(KURL(KURL(), item->url()), sandboxExtensionHandle);
-    if (createdExtension)
-        process()->willAcquireUniversalFileReadSandboxExtension();
-    process()->send(Messages::WebPage::GoToBackForwardItem(item->itemID(), sandboxExtensionHandle), m_pageID);
+    process()->send(Messages::WebPage::GoToBackForwardItem(item->itemID()), m_pageID);
     process()->responsivenessTimer()->start();
 }
 
@@ -509,15 +505,24 @@
 
 void WebPageProxy::reload(bool reloadFromOrigin)
 {
-    if (m_backForwardList->currentItem())
-        setPendingAPIRequestURL(m_backForwardList->currentItem()->url());
+    SandboxExtension::Handle sandboxExtensionHandle;
 
+    if (m_backForwardList->currentItem()) {
+        String url = ""
+        setPendingAPIRequestURL(url);
+
+        // We may not have an extension yet if back/forward list was reinstated after a WebProcess crash or a browser relaunch
+        bool createdExtension = maybeInitializeSandboxExtensionHandle(KURL(KURL(), url), sandboxExtensionHandle);
+        if (createdExtension)
+            process()->willAcquireUniversalFileReadSandboxExtension();
+    }
+
     if (!isValid()) {
         reattachToWebProcessWithItem(m_backForwardList->currentItem());
         return;
     }
 
-    process()->send(Messages::WebPage::Reload(reloadFromOrigin), m_pageID);
+    process()->send(Messages::WebPage::Reload(reloadFromOrigin, sandboxExtensionHandle), m_pageID);
     process()->responsivenessTimer()->start();
 }
 
@@ -527,19 +532,17 @@
         return;
 
     WebBackForwardListItem* forwardItem = m_backForwardList->forwardItem();
-    if (forwardItem)
-        setPendingAPIRequestURL(forwardItem->url());
+    if (!forwardItem)
+        return;
 
+    setPendingAPIRequestURL(forwardItem->url());
+
     if (!isValid()) {
         reattachToWebProcessWithItem(forwardItem);
         return;
     }
 
-    SandboxExtension::Handle sandboxExtensionHandle;
-    bool createdExtension = maybeInitializeSandboxExtensionHandle(KURL(KURL(), forwardItem->url()), sandboxExtensionHandle);
-    if (createdExtension)
-        process()->willAcquireUniversalFileReadSandboxExtension();
-    process()->send(Messages::WebPage::GoForward(forwardItem->itemID(), sandboxExtensionHandle), m_pageID);
+    process()->send(Messages::WebPage::GoForward(forwardItem->itemID()), m_pageID);
     process()->responsivenessTimer()->start();
 }
 
@@ -554,19 +557,17 @@
         return;
 
     WebBackForwardListItem* backItem = m_backForwardList->backItem();
-    if (backItem)
-        setPendingAPIRequestURL(backItem->url());
+    if (!backItem)
+        return;
 
+    setPendingAPIRequestURL(backItem->url());
+
     if (!isValid()) {
         reattachToWebProcessWithItem(backItem);
         return;
     }
 
-    SandboxExtension::Handle sandboxExtensionHandle;
-    bool createdExtension = maybeInitializeSandboxExtensionHandle(KURL(KURL(), backItem->url()), sandboxExtensionHandle);
-    if (createdExtension)
-        process()->willAcquireUniversalFileReadSandboxExtension();
-    process()->send(Messages::WebPage::GoBack(backItem->itemID(), sandboxExtensionHandle), m_pageID);
+    process()->send(Messages::WebPage::GoBack(backItem->itemID()), m_pageID);
     process()->responsivenessTimer()->start();
 }
 
@@ -584,11 +585,7 @@
     
     setPendingAPIRequestURL(item->url());
 
-    SandboxExtension::Handle sandboxExtensionHandle;
-    bool createdExtension = maybeInitializeSandboxExtensionHandle(KURL(KURL(), item->url()), sandboxExtensionHandle);
-    if (createdExtension)
-        process()->willAcquireUniversalFileReadSandboxExtension();
-    process()->send(Messages::WebPage::GoToBackForwardItem(item->itemID(), sandboxExtensionHandle), m_pageID);
+    process()->send(Messages::WebPage::GoToBackForwardItem(item->itemID()), m_pageID);
     process()->responsivenessTimer()->start();
 }
 
@@ -2448,9 +2445,16 @@
     m_backForwardList->addItem(process()->webBackForwardItem(itemID));
 }
 
-void WebPageProxy::backForwardGoToItem(uint64_t itemID)
+void WebPageProxy::backForwardGoToItem(uint64_t itemID, SandboxExtension::Handle& sandboxExtensionHandle)
 {
-    m_backForwardList->goToItem(process()->webBackForwardItem(itemID));
+    WebBackForwardListItem* item = process()->webBackForwardItem(itemID);
+    if (!item)
+        return;
+
+    bool createdExtension = maybeInitializeSandboxExtensionHandle(KURL(KURL(), item->url()), sandboxExtensionHandle);
+    if (createdExtension)
+        process()->willAcquireUniversalFileReadSandboxExtension();
+    m_backForwardList->goToItem(item);
 }
 
 void WebPageProxy::backForwardItemAtIndex(int32_t index, uint64_t& itemID)

Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (107355 => 107356)


--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h	2012-02-10 05:42:55 UTC (rev 107355)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h	2012-02-10 05:45:10 UTC (rev 107356)
@@ -743,7 +743,7 @@
 
     // Back/Forward list management
     void backForwardAddItem(uint64_t itemID);
-    void backForwardGoToItem(uint64_t itemID);
+    void backForwardGoToItem(uint64_t itemID, SandboxExtension::Handle&);
     void backForwardItemAtIndex(int32_t index, uint64_t& itemID);
     void backForwardBackListCount(int32_t& count);
     void backForwardForwardListCount(int32_t& count);

Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (107355 => 107356)


--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in	2012-02-10 05:42:55 UTC (rev 107355)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in	2012-02-10 05:45:10 UTC (rev 107356)
@@ -156,7 +156,7 @@
 
     # BackForward messages
     BackForwardAddItem(uint64_t itemID)
-    BackForwardGoToItem(uint64_t itemID)
+    BackForwardGoToItem(uint64_t itemID) -> (WebKit::SandboxExtension::Handle sandboxExtensionHandle)
     BackForwardItemAtIndex(int32_t itemIndex) -> (uint64_t itemID)
     BackForwardBackListCount() -> (int32_t count)
     BackForwardForwardListCount() -> (int32_t count)

Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (107355 => 107356)


--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp	2012-02-10 05:42:55 UTC (rev 107355)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp	2012-02-10 05:45:10 UTC (rev 107356)
@@ -245,7 +245,17 @@
             return true;
     }
 
+    // Items in back/forward list have been already checked.
+    // One case where we don't have sandbox extensions for file URLs in b/f list is if the list has been reinstated after a crash or a browser restart.
+    for (WebBackForwardListItemMap::iterator iter = m_backForwardListItemMap.begin(), end = m_backForwardListItemMap.end(); iter != end; ++iter) {
+        if (KURL(KURL(), iter->second->url()).fileSystemPath() == path)
+            return true;
+        if (KURL(KURL(), iter->second->originalURL()).fileSystemPath() == path)
+            return true;
+    }
+
     // A Web process that was never asked to load a file URL should not ever ask us to do anything with a file URL.
+    fprintf(stderr, "Received an unexpected URL from the web process: '%s'\n", url.string().utf8().data());
     return false;
 }
 
@@ -368,9 +378,7 @@
 
 void WebProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID messageID)
 {
-    // This fprintf is intentionally left because this function should 
-    // only be hit in the case of a misbehaving web process.
-    fprintf(stderr, "Receive an invalid message from the web process with message ID %x\n", messageID.toInt());
+    fprintf(stderr, "Received an invalid message from the web process with message ID %x\n", messageID.toInt());
 
     // Terminate the WebProcesses.
     terminate();

Modified: trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp (107355 => 107356)


--- trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp	2012-02-10 05:42:55 UTC (rev 107355)
+++ trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp	2012-02-10 05:45:10 UTC (rev 107356)
@@ -164,15 +164,10 @@
                 if (provisionalURL)
                     process()->send(Messages::WebPage::RestoreSession(state), m_pageID);
                 else {
-                    SandboxExtension::Handle sandboxExtensionHandle;
-                    if (WebBackForwardListItem* item = m_backForwardList->currentItem()) {
-                        bool createdExtension = maybeInitializeSandboxExtensionHandle(KURL(KURL(), item->url()), sandboxExtensionHandle);
-                        if (createdExtension)
-                            process()->willAcquireUniversalFileReadSandboxExtension();
+                    if (WebBackForwardListItem* item = m_backForwardList->currentItem())
                         setPendingAPIRequestURL(item->url());
-                    }
 
-                    process()->send(Messages::WebPage::RestoreSessionAndNavigateToCurrentItem(state, sandboxExtensionHandle), m_pageID);
+                    process()->send(Messages::WebPage::RestoreSessionAndNavigateToCurrentItem(state), m_pageID);
                 }
             }
         }

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp (107355 => 107356)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp	2012-02-10 05:42:55 UTC (rev 107355)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp	2012-02-10 05:45:10 UTC (rev 107356)
@@ -163,7 +163,9 @@
     if (!m_page)
         return;
 
-    m_page->send(Messages::WebPageProxy::BackForwardGoToItem(historyItemToIDMap().get(item)));
+    SandboxExtension::Handle sandboxExtensionHandle;
+    m_page->sendSync(Messages::WebPageProxy::BackForwardGoToItem(historyItemToIDMap().get(item)), Messages::WebPageProxy::BackForwardGoToItem::Reply(sandboxExtensionHandle));
+    m_page->sandboxExtensionTracker().beginLoad(m_page->mainWebFrame(), sandboxExtensionHandle);
 }
 
 HistoryItem* WebBackForwardListProxy::itemAtIndex(int itemIndex)

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (107355 => 107356)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2012-02-10 05:42:55 UTC (rev 107355)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2012-02-10 05:45:10 UTC (rev 107356)
@@ -713,14 +713,15 @@
     m_page->setDefersLoading(defersLoading);
 }
 
-void WebPage::reload(bool reloadFromOrigin)
+void WebPage::reload(bool reloadFromOrigin, const SandboxExtension::Handle& sandboxExtensionHandle)
 {
     SendStopResponsivenessTimer stopper(this);
 
+    m_sandboxExtensionTracker.beginLoad(m_mainFrame.get(), sandboxExtensionHandle);
     m_mainFrame->coreFrame()->loader()->reload(reloadFromOrigin);
 }
 
-void WebPage::goForward(uint64_t backForwardItemID, const SandboxExtension::Handle& sandboxExtensionHandle)
+void WebPage::goForward(uint64_t backForwardItemID)
 {
     SendStopResponsivenessTimer stopper(this);
 
@@ -729,11 +730,10 @@
     if (!item)
         return;
 
-    m_sandboxExtensionTracker.beginLoad(m_mainFrame.get(), sandboxExtensionHandle);
     m_page->goToItem(item, FrameLoadTypeForward);
 }
 
-void WebPage::goBack(uint64_t backForwardItemID, const SandboxExtension::Handle& sandboxExtensionHandle)
+void WebPage::goBack(uint64_t backForwardItemID)
 {
     SendStopResponsivenessTimer stopper(this);
 
@@ -742,11 +742,10 @@
     if (!item)
         return;
 
-    m_sandboxExtensionTracker.beginLoad(m_mainFrame.get(), sandboxExtensionHandle);
     m_page->goToItem(item, FrameLoadTypeBack);
 }
 
-void WebPage::goToBackForwardItem(uint64_t backForwardItemID, const SandboxExtension::Handle& sandboxExtensionHandle)
+void WebPage::goToBackForwardItem(uint64_t backForwardItemID)
 {
     SendStopResponsivenessTimer stopper(this);
 
@@ -755,7 +754,6 @@
     if (!item)
         return;
 
-    m_sandboxExtensionTracker.beginLoad(m_mainFrame.get(), sandboxExtensionHandle);
     m_page->goToItem(item, FrameLoadTypeIndexedBackForward);
 }
 
@@ -1439,10 +1437,10 @@
     return currentItemID;
 }
 
-void WebPage::restoreSessionAndNavigateToCurrentItem(const SessionState& sessionState, const SandboxExtension::Handle& sandboxExtensionHandle)
+void WebPage::restoreSessionAndNavigateToCurrentItem(const SessionState& sessionState)
 {
     if (uint64_t currentItemID = restoreSession(sessionState))
-        goToBackForwardItem(currentItemID, sandboxExtensionHandle);
+        goToBackForwardItem(currentItemID);
 }
 
 #if ENABLE(TOUCH_EVENTS)

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (107355 => 107356)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h	2012-02-10 05:42:55 UTC (rev 107355)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h	2012-02-10 05:45:10 UTC (rev 107356)
@@ -536,10 +536,10 @@
     void loadAlternateHTMLString(const String& htmlString, const String& baseURL, const String& unreachableURL);
     void loadPlainTextString(const String&);
     void linkClicked(const String& url, const WebMouseEvent&);
-    void reload(bool reloadFromOrigin);
-    void goForward(uint64_t, const SandboxExtension::Handle&);
-    void goBack(uint64_t, const SandboxExtension::Handle&);
-    void goToBackForwardItem(uint64_t, const SandboxExtension::Handle&);
+    void reload(bool reloadFromOrigin, const SandboxExtension::Handle&);
+    void goForward(uint64_t);
+    void goBack(uint64_t);
+    void goToBackForwardItem(uint64_t);
     void tryRestoreScrollPosition();
     void setActive(bool);
     void setFocused(bool);
@@ -567,7 +567,7 @@
     static void logicalScroll(WebCore::Page*, WebCore::ScrollLogicalDirection, WebCore::ScrollGranularity);
 
     uint64_t restoreSession(const SessionState&);
-    void restoreSessionAndNavigateToCurrentItem(const SessionState&, const SandboxExtension::Handle&);
+    void restoreSessionAndNavigateToCurrentItem(const SessionState&);
 
     void didRemoveBackForwardItem(uint64_t);

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (107355 => 107356)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in	2012-02-10 05:42:55 UTC (rev 107355)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in	2012-02-10 05:45:10 UTC (rev 107356)
@@ -50,9 +50,9 @@
     ScrollBy(uint32_t scrollDirection, uint32_t scrollGranularity)
     CenterSelectionInVisibleArea()
 
-    GoBack(uint64_t backForwardItemID, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
-    GoForward(uint64_t backForwardItemID, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
-    GoToBackForwardItem(uint64_t backForwardItemID, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
+    GoBack(uint64_t backForwardItemID)
+    GoForward(uint64_t backForwardItemID)
+    GoToBackForwardItem(uint64_t backForwardItemID)
     TryRestoreScrollPosition()
     LoadHTMLString(WTF::String htmlString, WTF::String baseURL)
     LoadAlternateHTMLString(WTF::String htmlString, WTF::String baseURL, WTF::String unreachableURL); 
@@ -60,7 +60,7 @@
     LoadURL(WTF::String url, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
     LoadURLRequest(WebCore::ResourceRequest request, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
     LinkClicked(WTF::String url, WebKit::WebMouseEvent event)
-    Reload(bool reloadFromOrigin)
+    Reload(bool reloadFromOrigin, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
     StopLoading()
 
 #if PLATFORM(QT)
@@ -71,7 +71,7 @@
     StopLoadingFrame(uint64_t frameID)
     
     RestoreSession(WebKit::SessionState state)
-    RestoreSessionAndNavigateToCurrentItem(WebKit::SessionState state, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
+    RestoreSessionAndNavigateToCurrentItem(WebKit::SessionState state)
 
     DidRemoveBackForwardItem(uint64_t backForwardItemID)
 

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

Reply via email to