Changeset 64324 in webkit

Timestamp:

Jul 29, 2010 5:40:39 PM (14 years ago)

Author:

beidson@apple.com

Message:

2010-07-29 Brady Eidson <​beidson@apple.com>

Reviewed by Sam Weinig.

Setting empty document schemes on the WKContext shouldn't start the WebProcess
<rdar://problem/8253734> and ​https://bugs.webkit.org/show_bug.cgi?id=43222

• UIProcess/WebContext.cpp: (WebKit::WebContext::ensureWebProcess): (WebKit::WebContext::registerURLSchemeAsEmptyDocument):
• UIProcess/WebContext.h:

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebContext.cpp (modified) (2 diffs)
• UIProcess/WebContext.h (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-07-29  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Setting empty document schemes on the WKContext shouldn't start the WebProcess
+        <rdar://problem/8253734> and https://bugs.webkit.org/show_bug.cgi?id=43222
+        
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::ensureWebProcess):
+        (WebKit::WebContext::registerURLSchemeAsEmptyDocument):
+        * UIProcess/WebContext.h:
+
 2010-07-29  Brady Eidson  <beidson@apple.com>
 

trunk/WebKit2/UIProcess/WebContext.cpp

@@ -107 +107 @@
 
     m_process->send(WebProcessMessage::SetShouldTrackVisitedLinks, 0, CoreIPC::In(m_historyClient.shouldTrackVisitedLinks()));
+
+    for (HashSet<String>::iterator it = m_schemesToRegisterAsEmptyDocument.begin(), end = m_schemesToRegisterAsEmptyDocument.end(); it != end; ++it)
+        m_process->send(WebProcessMessage::RegisterURLSchemeAsEmptyDocument, 0, CoreIPC::In(*it));
 }
 
@@ -229 +232 @@
 void WebContext::registerURLSchemeAsEmptyDocument(const String& urlScheme)
 {
-    ensureWebProcess();
+    m_schemesToRegisterAsEmptyDocument.add(urlScheme);
+
+    if (!hasValidProcess())
+        return;
 
     m_process->send(WebProcessMessage::RegisterURLSchemeAsEmptyDocument, 0, CoreIPC::In(urlScheme));

trunk/WebKit2/UIProcess/WebContext.h

@@ -34 +34 @@
 #include "WebProcessProxy.h"
 #include <WebCore/PlatformString.h>
+#include <WebCore/StringHash.h>
 #include <wtf/Forward.h>
 #include <wtf/HashSet.h>
@@ -119 +120 @@
 
     PluginInfoStore m_pluginInfoStore;
+    
+    HashSet<WebCore::String> m_schemesToRegisterAsEmptyDocument;
 };