Changeset 160727 in webkit

Timestamp:

Dec 17, 2013 1:30:06 PM (10 years ago)

Author:

andersca@apple.com

Message:

Back out r159982
​https://bugs.webkit.org/show_bug.cgi?id=125870
<rdar://problem/15598485>

Reviewed by Dan Bernstein.

Looks like r159982 caused intermittent crashes. Back it out for now.

• UIProcess/WebContextUserMessageCoders.h:

(WebKit::WebContextUserMessageEncoder::encode):
(WebKit::WebContextUserMessageDecoder::decode):

• UIProcess/WebPageGroup.cpp:
• UIProcess/WebPageGroup.h:

(WebKit::WebPageGroup::sendToAllProcessesInGroup):

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::initializeWebPage):

• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::disconnect):

• UIProcess/WebProcessProxy.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebContextUserMessageCoders.h (modified) (2 diffs)
• UIProcess/WebPageGroup.cpp (modified) (1 diff)
• UIProcess/WebPageGroup.h (modified) (3 diffs)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebProcessProxy.cpp (modified) (3 diffs)
• UIProcess/WebProcessProxy.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-17  Anders Carlsson  <andersca@apple.com>
+
+        Back out r159982
+        https://bugs.webkit.org/show_bug.cgi?id=125870
+        <rdar://problem/15598485>
+
+        Reviewed by Dan Bernstein.
+
+        Looks like r159982 caused intermittent crashes. Back it out for now.
+
+        * UIProcess/WebContextUserMessageCoders.h:
+        (WebKit::WebContextUserMessageEncoder::encode):
+        (WebKit::WebContextUserMessageDecoder::decode):
+        * UIProcess/WebPageGroup.cpp:
+        * UIProcess/WebPageGroup.h:
+        (WebKit::WebPageGroup::sendToAllProcessesInGroup):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::initializeWebPage):
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::disconnect):
+        * UIProcess/WebProcessProxy.h:
+
 2013-12-17  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h

@@ -77 +77 @@
         case API::Object::Type::PageGroup: {
             WebPageGroup* pageGroup = static_cast<WebPageGroup*>(m_root);
-            if (pageGroup->addProcess(m_process))
-                m_process.addWebPageGroup(*pageGroup);
             encoder << pageGroup->data();
             break;
@@ -148 +146 @@
             if (!decoder.decode(pageGroupID))
                 return false;
-            coder.m_root = coder.m_process.webPageGroup(pageGroupID);
+            coder.m_root = WebPageGroup::get(pageGroupID);
             break;
         }

trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp

@@ -195 +195 @@
 }
 
-bool WebPageGroup::addProcess(WebProcessProxy& process)
-{
-    return m_processes.add(&process).isNewEntry;
-}
-
-void WebPageGroup::disconnectProcess(WebProcessProxy& process)
-{
-    m_processes.remove(&process);
-}
-
 } // namespace WebKit

trunk/Source/WebKit2/UIProcess/WebPageGroup.h

@@ -66 +66 @@
     void removeAllUserContent();
 
-    bool addProcess(WebProcessProxy&);
-    void disconnectProcess(WebProcessProxy&);
-
 private:
     template<typename T> void sendToAllProcessesInGroup(const T&, uint64_t destinationID);
@@ -75 +72 @@
     mutable RefPtr<WebPreferences> m_preferences;
     HashSet<WebPageProxy*> m_pages;
-    HashSet<WebProcessProxy*> m_processes;
 };
 
@@ -81 +77 @@
 void WebPageGroup::sendToAllProcessesInGroup(const T& message, uint64_t destinationID)
 {
-    for (auto webProcessProxy : m_processes) {
-        if (webProcessProxy->canSendMessage())
-            webProcessProxy->send(T(message), destinationID);
+    HashSet<WebProcessProxy*> processesSeen;
+
+    for (WebPageProxy* webPageProxy : m_pages) {
+        WebProcessProxy& webProcessProxy = webPageProxy->process();
+        if (!processesSeen.add(&webProcessProxy).isNewEntry)
+            continue;
+
+        if (webProcessProxy.canSendMessage())
+            webProcessProxy.send(T(message), destinationID);
     }
 }

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -518 +518 @@
 #endif
 
-    if (pageGroup().addProcess(process()))
-        process().addWebPageGroup(pageGroup());
-
     initializeCreationParameters();
     process().send(Messages::WebProcess::CreateWebPage(m_pageID, m_creationParameters), 0);

trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -40 +40 @@
 #include "WebNavigationDataStore.h"
 #include "WebNotificationManagerProxy.h"
-#include "WebPageGroup.h"
 #include "WebPageProxy.h"
 #include "WebPluginSiteDataManager.h"
@@ -148 +147 @@
     Vector<RefPtr<WebFrameProxy>> frames;
     copyValuesToVector(m_frameMap, frames);
-    for (auto frame : frames)
-        frame->disconnect();
+
+    for (size_t i = 0, size = frames.size(); i < size; ++i)
+        frames[i]->disconnect();
     m_frameMap.clear();
-
-    Vector<WebPageGroup*> pageGroups;
-    copyValuesToVector(m_pageGroups, pageGroups);
-    for (auto pageGroup : pageGroups)
-        pageGroup->disconnectProcess(*this);
-    m_pageGroups.clear();
 
     if (m_downloadProxyMap)
@@ -216 +210 @@
     copyValuesToVector(m_pageMap, result);
     return result;
-}
-
-WebPageGroup* WebProcessProxy::webPageGroup(uint64_t pageGroupID)
-{
-    if (!HashMap<uint64_t, WebPageGroup*>::isValidKey(pageGroupID))
-        return nullptr;
-
-    return m_pageGroups.get(pageGroupID);
-}
-
-void WebProcessProxy::addWebPageGroup(WebPageGroup& pageGroup)
-{
-    m_pageGroups.add(pageGroup.pageGroupID(), &pageGroup);
 }
 

trunk/Source/WebKit2/UIProcess/WebProcessProxy.h

@@ -83 +83 @@
     Vector<WebPageProxy*> pages() const;
 
-    WebPageGroup* webPageGroup(uint64_t pageGroupID);
-    void addWebPageGroup(WebPageGroup&);
-
     WebBackForwardListItem* webBackForwardItem(uint64_t itemID) const;
 
@@ -200 +197 @@
     WebFrameProxyMap m_frameMap;
     WebBackForwardListItemMap m_backForwardListItemMap;
-    HashMap<uint64_t, WebPageGroup*> m_pageGroups;
 
     OwnPtr<DownloadProxyMap> m_downloadProxyMap;