Changeset 182688 in webkit

Timestamp:

Apr 13, 2015, 1:58:41 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r182084 - WebProcessProxy should not retain WebBackForwardListItems forever.
<​https://webkit.org/b/143152>
<rdar://problem/19925709>

Reviewed by Anders Carlsson.

Have WebProcessProxy actually forget about a WebBackForwardListItem after it's removed from
the WebBackForwardList.

This ensures that we don't accumulate too many of these objects, which can get quite large
due to the session state encoded in them.

We already have graceful handling of the case where an incoming IPC message references
a removed back/forward list item.

• UIProcess/WebBackForwardList.cpp:

(WebKit::WebBackForwardList::didRemoveItem):

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::backForwardRemovedItem):

• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::removeBackForwardItem):

• UIProcess/WebProcessProxy.h:

Location:

releases/WebKitGTK/webkit-2.8/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebBackForwardList.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebProcessProxy.cpp (modified) (1 diff)
• UIProcess/WebProcessProxy.h (modified) (1 diff)

releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-27  Andreas Kling  <akling@apple.com>
+
+        WebProcessProxy should not retain WebBackForwardListItems forever.
+        <https://webkit.org/b/143152>
+        <rdar://problem/19925709>
+
+        Reviewed by Anders Carlsson.
+
+        Have WebProcessProxy actually forget about a WebBackForwardListItem after it's removed from
+        the WebBackForwardList.
+
+        This ensures that we don't accumulate too many of these objects, which can get quite large
+        due to the session state encoded in them.
+
+        We already have graceful handling of the case where an incoming IPC message references
+        a removed back/forward list item.
+
+        * UIProcess/WebBackForwardList.cpp:
+        (WebKit::WebBackForwardList::didRemoveItem):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::backForwardRemovedItem):
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::removeBackForwardItem):
+        * UIProcess/WebProcessProxy.h:
+
 2015-03-26  Zan Dobersek  <zdobersek@igalia.com>
 

releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/WebBackForwardList.cpp

@@ -437 +437 @@
 void WebBackForwardList::didRemoveItem(WebBackForwardListItem& backForwardListItem)
 {
-    // FIXME: This should really also delete the item from the map.
     m_page->backForwardRemovedItem(backForwardListItem.itemID());
 

releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -5130 +5130 @@
 void WebPageProxy::backForwardRemovedItem(uint64_t itemID)
 {
+    m_process->removeBackForwardItem(itemID);
     m_process->send(Messages::WebPage::DidRemoveBackForwardItem(itemID), m_pageID);
 }

releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -269 +269 @@
 }
 
+void WebProcessProxy::removeBackForwardItem(uint64_t itemID)
+{
+    m_backForwardListItemMap.remove(itemID);
+}
+
 void WebProcessProxy::assumeReadAccessToBaseURL(const String& urlString)
 {

releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/WebProcessProxy.h

@@ -107 +107 @@
 
     void registerNewWebBackForwardListItem(WebBackForwardListItem*);
+    void removeBackForwardItem(uint64_t);
 
     void willAcquireUniversalFileReadSandboxExtension() { m_mayHaveUniversalFileReadSandboxExtension = true; }