Changeset 149646 in webkit

Timestamp:

May 6, 2013 3:49:17 PM (11 years ago)

Author:

ap@apple.com

Message:

<rdar://problem/13479806> [Mac] Pass information about open pages to LaunchServices
​https://bugs.webkit.org/show_bug.cgi?id=115665

Reviewed by Darin Adler.

• WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::didCommitLoad): Moved repeated check for frame->isMainFrame() to the top, matching oter similar functions. Call updateActivePages().

• WebProcess/WebProcess.cpp: (WebKit::WebProcess::networkProcessConnectionClosed): Removed an obsolete FIXME. (WebKit::WebProcess::updateActivePages): Empty implementation for platforms that don't need to do anything here.

• WebProcess/WebProcess.h: Added updateActivePages().

• WebProcess/mac/WebProcessMac.mm: (WebKit::WebProcess::updateActivePages): Collect user visible origins of pages in the process and pass them to LS.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)
• WebProcess/WebProcess.cpp (modified) (2 diffs)
• WebProcess/WebProcess.h (modified) (1 diff)
• WebProcess/mac/WebProcessMac.mm (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-05-06  Alexey Proskuryakov  <ap@apple.com>
+
+        <rdar://problem/13479806> [Mac] Pass information about open pages to LaunchServices
+        https://bugs.webkit.org/show_bug.cgi?id=115665
+
+        Reviewed by Darin Adler.
+
+        * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::didCommitLoad): Moved repeated
+        check for frame->isMainFrame() to the top, matching oter similar functions.
+        Call updateActivePages().
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::networkProcessConnectionClosed): Removed an obsolete FIXME.
+        (WebKit::WebProcess::updateActivePages): Empty implementation for platforms
+        that don't need to do anything here.
+
+        * WebProcess/WebProcess.h: Added updateActivePages().
+
+        * WebProcess/mac/WebProcessMac.mm: (WebKit::WebProcess::updateActivePages):
+        Collect user visible origins of pages in the process and pass them to LS.
+
 2013-05-06  Mark Rowe  <mrowe@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -3953 +3953 @@
 void WebPage::didCommitLoad(WebFrame* frame)
 {
+    if (!frame->isMainFrame())
+        return;
+
     // If previous URL is invalid, then it's not a real page that's being navigated away from.
     // Most likely, this is actually the first load to be committed in this page.
-    if (frame->isMainFrame() && frame->coreFrame()->loader()->previousURL().isValid())
+    if (frame->coreFrame()->loader()->previousURL().isValid())
         reportUsedFeatures();
 
     // Only restore the scale factor for standard frame loads (of the main frame).
-    if (frame->isMainFrame() && frame->coreFrame()->loader()->loadType() == FrameLoadTypeStandard) {
+    if (frame->coreFrame()->loader()->loadType() == FrameLoadTypeStandard) {
         Page* page = frame->coreFrame()->page();
         if (page && page->pageScaleFactor() != 1)
@@ -3966 +3969 @@
 
 #if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
-    if (frame->isMainFrame())
-        resetPrimarySnapshottedPlugIn();
-#endif
+    resetPrimarySnapshottedPlugIn();
+#endif
+
+    WebProcess::shared().updateActivePages();
 }
 

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -1034 +1034 @@
 void WebProcess::networkProcessConnectionClosed(NetworkProcessConnection* connection)
 {
-    // FIXME (NetworkProcess): How do we handle not having the connection when the WebProcess needs it?
-    // If the NetworkProcess crashed, for example.  Do we respawn it?
     ASSERT(m_networkProcessConnection);
     ASSERT(m_networkProcessConnection == connection);
@@ -1124 +1122 @@
 {
 }
+
+void WebProcess::updateActivePages()
+{
+}
+
 #endif
     

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -185 +185 @@
     void pageDidEnterWindow(WebPage*);
     void pageWillLeaveWindow(WebPage*);
-    
+
     void nonVisibleProcessCleanupTimerFired(WebCore::Timer<WebProcess>*);
+
+    void updateActivePages();
 
 private:

trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm

@@ -31 +31 @@
 #import "SandboxInitializationParameters.h"
 #import "WKFullKeyboardAccessWatcher.h"
+#import "WebFrame.h"
 #import "WebInspector.h"
 #import "WebPage.h"
@@ -40 +41 @@
 #import <WebCore/MemoryCache.h>
 #import <WebCore/PageCache.h>
+#import <WebCore/WebCoreNSURLExtras.h>
 #import <WebKitSystemInterface.h>
 #import <algorithm>
@@ -56 +58 @@
 using namespace std;
 
+const CFStringRef kLSActivePageUserVisibleOriginsKey = CFSTR("LSActivePageUserVisibleOriginsKey");
+
 namespace WebKit {
 
@@ -221 +225 @@
 }
 
+void WebProcess::updateActivePages()
+{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+    RetainPtr<CFMutableArrayRef> activePageURLs = adoptCF(CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks));
+    for (const auto& iter: m_pageMap) {
+        WebPage* page = iter.value.get();
+        WebFrame* mainFrame = page->mainWebFrame();
+        if (!mainFrame)
+            continue;
+        String mainFrameOriginString;
+        RefPtr<SecurityOrigin> mainFrameOrigin = SecurityOrigin::createFromString(mainFrame->url());
+        if (!mainFrameOrigin->isUnique())
+            mainFrameOriginString = mainFrameOrigin->toRawString();
+        else
+            mainFrameOriginString = KURL(KURL(), mainFrame->url()).protocol() + ':'; // toRawString() is not supposed to work with unique origins, and would just return "://".
+        CFArrayAppendValue(activePageURLs.get(), userVisibleString([NSURL URLWithString:mainFrameOriginString]));
+    }
+    WKSetApplicationInformationItem(kLSActivePageUserVisibleOriginsKey, activePageURLs.get());
+#endif
+}
+
 } // namespace WebKit