Changeset 159982 in webkit

Timestamp:

Dec 2, 2013 4:43:27 PM (10 years ago)

Author:

weinig@apple.com

Message:

WebPageGroups should keep track of what processes they are being used by
​https://bugs.webkit.org/show_bug.cgi?id=124556

Reviewed by Anders Carlsson.

• UIProcess/WebContextUserMessageCoders.h:

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

• UIProcess/WebPageGroup.cpp:

(WebKit::WebPageGroup::addProcess):
(WebKit::WebPageGroup::disconnectProcess):

• UIProcess/WebPageGroup.h:

(WebKit::WebPageGroup::sendToAllProcessesInGroup):

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::initializeWebPage):

• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::disconnect):
(WebKit::WebProcessProxy::webPageGroup):
(WebKit::WebProcessProxy::addWebPageGroup):

• UIProcess/WebProcessProxy.h:
• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::webPageGroup):

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)
• WebProcess/WebProcess.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-02  Sam Weinig  <sam@webkit.org>
+
+        WebPageGroups should keep track of what processes they are being used by
+        https://bugs.webkit.org/show_bug.cgi?id=124556
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/WebContextUserMessageCoders.h:
+        (WebKit::WebContextUserMessageEncoder::encode):
+        (WebKit::WebContextUserMessageDecoder::decode):
+        * UIProcess/WebPageGroup.cpp:
+        (WebKit::WebPageGroup::addProcess):
+        (WebKit::WebPageGroup::disconnectProcess):
+        * UIProcess/WebPageGroup.h:
+        (WebKit::WebPageGroup::sendToAllProcessesInGroup):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::initializeWebPage):
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::disconnect):
+        (WebKit::WebProcessProxy::webPageGroup):
+        (WebKit::WebProcessProxy::addWebPageGroup):
+        * UIProcess/WebProcessProxy.h:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::webPageGroup):
+
 2013-12-02  Anders Carlsson  <andersca@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;
@@ -146 +148 @@
             if (!decoder.decode(pageGroupID))
                 return false;
-            coder.m_root = WebPageGroup::get(pageGroupID);
+            coder.m_root = coder.m_process.webPageGroup(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);
@@ -72 +75 @@
     mutable RefPtr<WebPreferences> m_preferences;
     HashSet<WebPageProxy*> m_pages;
+    HashSet<WebProcessProxy*> m_processes;
 };
 
@@ -77 +81 @@
 void WebPageGroup::sendToAllProcessesInGroup(const T& message, uint64_t 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);
+    for (auto webProcessProxy : m_processes) {
+        if (webProcessProxy->canSendMessage())
+            webProcessProxy->send(T(message), destinationID);
     }
 }

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -515 +515 @@
 
 #if ENABLE(INSPECTOR_SERVER)
-    if (m_pageGroup->preferences()->developerExtrasEnabled())
+    if (pageGroup().preferences()->developerExtrasEnabled())
         inspector()->enableRemoteInspection();
 #endif
 
+    if (pageGroup().addProcess(process()))
+        process().addWebPageGroup(pageGroup());
+
     initializeCreationParameters();
-    m_process->send(Messages::WebProcess::CreateWebPage(m_pageID, m_creationParameters), 0);
+    process().send(Messages::WebProcess::CreateWebPage(m_pageID, m_creationParameters), 0);
 
 #if ENABLE(PAGE_VISIBILITY_API)
-    m_process->send(Messages::WebPage::SetVisibilityState(m_visibilityState, /* isInitialState */ true), m_pageID);
+    process().send(Messages::WebPage::SetVisibilityState(m_visibilityState, /* isInitialState */ true), m_pageID);
 #elif ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
-    m_process->send(Messages::WebPage::SetVisibilityState(isViewVisible() ? PageVisibilityStateVisible : PageVisibilityStateHidden, /* isInitialState */ true), m_pageID);
+    process().send(Messages::WebPage::SetVisibilityState(isViewVisible() ? PageVisibilityStateVisible : PageVisibilityStateHidden, /* isInitialState */ true), m_pageID);
 #endif
 
 #if PLATFORM(MAC)
-    m_process->send(Messages::WebPage::SetSmartInsertDeleteEnabled(m_isSmartInsertDeleteEnabled), m_pageID);
+    process().send(Messages::WebPage::SetSmartInsertDeleteEnabled(m_isSmartInsertDeleteEnabled), m_pageID);
 #endif
 }

trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -38 +38 @@
 #include "WebNavigationDataStore.h"
 #include "WebNotificationManagerProxy.h"
+#include "WebPageGroup.h"
 #include "WebPageProxy.h"
 #include "WebPluginSiteDataManager.h"
@@ -145 +146 @@
     Vector<RefPtr<WebFrameProxy>> frames;
     copyValuesToVector(m_frameMap, frames);
-
-    for (size_t i = 0, size = frames.size(); i < size; ++i)
-        frames[i]->disconnect();
+    for (auto frame : frames)
+        frame->disconnect();
     m_frameMap.clear();
+
+    Vector<WebPageGroup*> pageGroups;
+    copyValuesToVector(m_pageGroups, pageGroups);
+    for (auto pageGroup : pageGroups)
+        pageGroup->disconnectProcess(*this);
+    m_pageGroups.clear();
 
     if (m_downloadProxyMap)
@@ -208 +214 @@
     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;
 
@@ -195 +198 @@
     WebFrameProxyMap m_frameMap;
     WebBackForwardListItemMap m_backForwardListItemMap;
+    HashMap<uint64_t, WebPageGroup*> m_pageGroups;
 
     OwnPtr<DownloadProxyMap> m_downloadProxyMap;

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -722 +722 @@
 WebPageGroupProxy* WebProcess::webPageGroup(const WebPageGroupData& pageGroupData)
 {
-    HashMap<uint64_t, RefPtr<WebPageGroupProxy>>::AddResult result = m_pageGroupMap.add(pageGroupData.pageGroupID, nullptr);
+    auto result = m_pageGroupMap.add(pageGroupData.pageGroupID, nullptr);
     if (result.isNewEntry) {
         ASSERT(!result.iterator->value);