Changeset 130214 in webkit

Timestamp:

Oct 2, 2012, 2:49:33 PM (13 years ago)

Author:

ap@apple.com

Message:

<rdar://problem/12407139> WebKit2 should provide API that returns all pages in the same process as a given page
​https://bugs.webkit.org/show_bug.cgi?id=98193

Reviewed by Sam Weinig.

• UIProcess/API/C/WKPage.cpp: (WKPageCopyRelatedPages):
• UIProcess/API/C/WKPagePrivate.h:
• UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::relatedPages):
• UIProcess/WebPageProxy.h:
• UIProcess/WebProcessProxy.cpp: (WebKit::WebProcessProxy::pages):
• UIProcess/WebProcessProxy.h: Added. This should work once a process has crashed, too.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKPage.cpp (modified) (1 diff)
• UIProcess/API/C/WKPagePrivate.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• UIProcess/WebProcessProxy.cpp (modified) (1 diff)
• UIProcess/WebProcessProxy.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-10-02  Alexey Proskuryakov  <ap@apple.com>
+
+        <rdar://problem/12407139> WebKit2 should provide API that returns all pages in the same process as a given page
+        https://bugs.webkit.org/show_bug.cgi?id=98193
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageCopyRelatedPages):
+        * UIProcess/API/C/WKPagePrivate.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::relatedPages):
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::pages):
+        * UIProcess/WebProcessProxy.h:
+        Added. This should work once a process has crashed, too.
+
 2012-10-02  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

@@ -739 +739 @@
 }
 
+WKArrayRef WKPageCopyRelatedPages(WKPageRef pageRef)
+{
+    return toAPI(toImpl(pageRef)->relatedPages().leakRef());
+}

trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h

@@ -95 +95 @@
 WK_EXPORT void WKPageSetMediaVolume(WKPageRef page, float volume);
 
+WK_EXPORT WKArrayRef WKPageCopyRelatedPages(WKPageRef page);
+
 #ifdef __cplusplus
 }

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -278 +278 @@
 }
 
+PassRefPtr<ImmutableArray> WebPageProxy::relatedPages() const
+{
+    Vector<WebPageProxy*> pages = m_process->pages();
+    ASSERT(pages.contains(this));
+
+    Vector<RefPtr<APIObject> > result;
+    result.reserveCapacity(pages.size() - 1);
+    for (size_t i = 0; i < pages.size(); ++i) {
+        if (pages[i] != this)
+            result.append(pages[i]);
+    }
+
+    return ImmutableArray::adopt(result);
+}
+
 void WebPageProxy::initializeLoaderClient(const WKPageLoaderClient* loadClient)
 {

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -623 +623 @@
 
     bool isValid();
+
+    PassRefPtr<ImmutableArray> relatedPages() const;
 
     const String& urlAtProcessExit() const { return m_urlAtProcessExit; }

trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -187 +187 @@
 }
 
+Vector<WebPageProxy*> WebProcessProxy::pages() const
+{
+    Vector<WebPageProxy*> result;
+    copyValuesToVector(m_pageMap, result);
+    return result;
+}
+
 #if ENABLE(WEB_INTENTS)
 void WebProcessProxy::removeMessagePortChannel(uint64_t channelID)

trunk/Source/WebKit2/UIProcess/WebProcessProxy.h

@@ -85 +85 @@
     void addExistingWebPage(WebPageProxy*, uint64_t pageID);
     void removeWebPage(uint64_t pageID);
+    Vector<WebPageProxy*> pages() const;
 
 #if ENABLE(WEB_INTENTS)