Changeset 64070 in webkit

Timestamp:

Jul 26, 2010 1:37:56 PM (14 years ago)

Author:

beidson@apple.com

Message:

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

Reviewed by Sam Weinig.

Add ability for WK2 to register a scheme to always be displayed as an empty document
​https://bugs.webkit.org/show_bug.cgi?id=42995

No new tests. (Currently not possible to test in WebKit1 DRT, can be testing in future WK2 tester)

• WebCore.exp.in:

• loader/MainResourceLoader.cpp: (WebCore::shouldLoadAsEmptyDocument):

• platform/SchemeRegistry.cpp: (WebCore::emptyDocumentSchemes): (WebCore::SchemeRegistry::registerURLSchemeAsEmptyDocument): (WebCore::SchemeRegistry::shouldLoadURLSchemeAsEmptyDocument):
• platform/SchemeRegistry.h:

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

Reviewed by Sam Weinig.

Add ability for WK2 to register a scheme to always be displayed as an empty document
​https://bugs.webkit.org/show_bug.cgi?id=42995

• Shared/CoreIPCSupport/WebProcessMessageKinds.h: (WebProcessMessage::):

• UIProcess/API/C/WKContext.cpp: (_WKContextRegisterURLSchemeAsEmptyDocument):
• UIProcess/API/C/WKContextPrivate.h:

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

• WebProcess/WebProcess.cpp: (WebKit::WebProcess::registerURLSchemeAsEmptyDocument): (WebKit::WebProcess::didReceiveMessage):
• WebProcess/WebProcess.h:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/loader/MainResourceLoader.cpp (modified) (2 diffs)
• WebCore/platform/SchemeRegistry.cpp (modified) (2 diffs)
• WebCore/platform/SchemeRegistry.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/CoreIPCSupport/WebProcessMessageKinds.h (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKContext.cpp (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKContextPrivate.h (modified) (1 diff)
• WebKit2/UIProcess/WebContext.cpp (modified) (1 diff)
• WebKit2/UIProcess/WebContext.h (modified) (1 diff)
• WebKit2/WebProcess/WebProcess.cpp (modified) (3 diffs)
• WebKit2/WebProcess/WebProcess.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-26  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Add ability for WK2 to register a scheme to always be displayed as an empty document
+        https://bugs.webkit.org/show_bug.cgi?id=42995
+
+        No new tests. (Currently not possible to test in WebKit1 DRT, can be testing in future WK2 tester)
+
+        * WebCore.exp.in:
+        
+        * loader/MainResourceLoader.cpp:
+        (WebCore::shouldLoadAsEmptyDocument):
+        
+        * platform/SchemeRegistry.cpp:
+        (WebCore::emptyDocumentSchemes):
+        (WebCore::SchemeRegistry::registerURLSchemeAsEmptyDocument):
+        (WebCore::SchemeRegistry::shouldLoadURLSchemeAsEmptyDocument):
+        * platform/SchemeRegistry.h:
+
 2010-07-26  Patrick Gansterer  <paroga@paroga.com>
 

trunk/WebCore/WebCore.exp.in

@@ -313 +313 @@
 __ZN7WebCore14SchemeRegistry24registerURLSchemeAsLocalERKNS_6StringE
 __ZN7WebCore14SchemeRegistry25registerURLSchemeAsSecureERKNS_6StringE
+__ZN7WebCore14SchemeRegistry32registerURLSchemeAsEmptyDocumentERKNS_6StringE
 __ZN7WebCore14SecurityOrigin16createFromStringERKNS_6StringE
 __ZN7WebCore14SecurityOrigin18setLocalLoadPolicyENS0_15LocalLoadPolicyE

trunk/WebCore/loader/MainResourceLoader.cpp

@@ -45 +45 @@
 #include "ResourceError.h"
 #include "ResourceHandle.h"
+#include "SchemeRegistry.h"
 #include "Settings.h"
 #include <wtf/CurrentTime.h>
@@ -207 +208 @@
     return url.isEmpty() || (url.protocolIs("about") && equalIgnoringRef(url, blankURL()));
 #else 
-    return url.isEmpty() || url.protocolIs("about");
+    return url.isEmpty() || SchemeRegistry::shouldLoadURLSchemeAsEmptyDocument(url.protocol());
 #endif
 }

trunk/WebCore/platform/SchemeRegistry.cpp

@@ -69 +69 @@
 
     return schemesWithUniqueOrigins;
+}
+
+static URLSchemesMap& emptyDocumentSchemes()
+{
+    DEFINE_STATIC_LOCAL(URLSchemesMap, emptyDocumentSchemes, ());
+
+    if (emptyDocumentSchemes.isEmpty())
+        emptyDocumentSchemes.add("about");
+
+    return emptyDocumentSchemes;
 }
 
@@ -150 +160 @@
 }
 
+void SchemeRegistry::registerURLSchemeAsEmptyDocument(const String& scheme)
+{
+    emptyDocumentSchemes().add(scheme);
+}
+
+bool SchemeRegistry::shouldLoadURLSchemeAsEmptyDocument(const String& scheme)
+{
+    return emptyDocumentSchemes().contains(scheme);
+}
+
 } // namespace WebCore

trunk/WebCore/platform/SchemeRegistry.h

@@ -52 +52 @@
     static void registerURLSchemeAsNoAccess(const String&);
     static bool shouldTreatURLSchemeAsNoAccess(const String&);
+    
+    static void registerURLSchemeAsEmptyDocument(const String&);
+    static bool shouldLoadURLSchemeAsEmptyDocument(const String&);
 };
 

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-07-26  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Add ability for WK2 to register a scheme to always be displayed as an empty document
+        https://bugs.webkit.org/show_bug.cgi?id=42995
+
+        * Shared/CoreIPCSupport/WebProcessMessageKinds.h:
+        (WebProcessMessage::):
+        
+        * UIProcess/API/C/WKContext.cpp:
+        (_WKContextRegisterURLSchemeAsEmptyDocument):
+        * UIProcess/API/C/WKContextPrivate.h:
+        
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::registerURLSchemeAsEmptyDocument):
+        * UIProcess/WebContext.h:
+        
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::registerURLSchemeAsEmptyDocument):
+        (WebKit::WebProcess::didReceiveMessage):
+        * WebProcess/WebProcess.h:
+
 2010-07-26  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/Shared/CoreIPCSupport/WebProcessMessageKinds.h

@@ -38 +38 @@
     Create,
     PostMessage,
+    RegisterURLSchemeAsEmptyDocument,
 #if PLATFORM(MAC)
     SetupAcceleratedCompositingPort

trunk/WebKit2/UIProcess/API/C/WKContext.cpp

@@ -99 +99 @@
     toWK(contextRef)->setAdditionalPluginPath(toWK(pluginPath));
 }
+
+void _WKContextRegisterURLSchemeAsEmptyDocument(WKContextRef contextRef, WKStringRef urlScheme)
+{
+    toWK(contextRef)->registerURLSchemeAsEmptyDocument(toWK(urlScheme));
+}

trunk/WebKit2/UIProcess/API/C/WKContextPrivate.h

@@ -47 +47 @@
 WK_EXPORT void _WKContextSetAdditionalPluginPath(WKContextRef context, WKStringRef pluginPath);
 
+WK_EXPORT void _WKContextRegisterURLSchemeAsEmptyDocument(WKContextRef context, WKStringRef urlScheme);
+
 #ifdef __cplusplus
 }

trunk/WebKit2/UIProcess/WebContext.cpp

@@ -181 +181 @@
 }
 
+void WebContext::registerURLSchemeAsEmptyDocument(WebCore::StringImpl* urlScheme)
+{
+    ensureWebProcess();
+
+    m_process->send(WebProcessMessage::RegisterURLSchemeAsEmptyDocument, 0, CoreIPC::In(String(urlScheme)));
+}
+
 } // namespace WebKit

trunk/WebKit2/UIProcess/WebContext.h

@@ -86 +86 @@
     PluginInfoStore* pluginInfoStore() { return &m_pluginInfoStore; }
     WebCore::String applicationCacheDirectory();
+    
+    void registerURLSchemeAsEmptyDocument(WebCore::StringImpl*);
 
 private:

trunk/WebKit2/WebProcess/WebProcess.cpp

@@ -38 +38 @@
 #include "WebProcessMessageKinds.h"
 #include <WebCore/ApplicationCacheStorage.h>
+#include <WebCore/SchemeRegistry.h>
 #include <wtf/PassRefPtr.h>
 
@@ -108 +109 @@
 
     m_injectedBundle->didReceiveMessage(message);
+}
+
+void WebProcess::registerURLSchemeAsEmptyDocument(const WebCore::String& urlScheme)
+{
+    SchemeRegistry::registerURLSchemeAsEmptyDocument(urlScheme);
 }
 
@@ -211 +217 @@
                 return;
             }
+            case WebProcessMessage::RegisterURLSchemeAsEmptyDocument: {
+                String message;
+                if (!arguments->decode(CoreIPC::Out(message)))
+                    return;
+
+                registerURLSchemeAsEmptyDocument(message);
+                return;
+            }
 #if USE(ACCELERATED_COMPOSITING) && PLATFORM(MAC)
             case WebProcessMessage::SetupAcceleratedCompositingPort: {

trunk/WebKit2/WebProcess/WebProcess.h

@@ -74 +74 @@
     void setApplicationCacheDirectory(const WebCore::String&);
     void forwardMessageToInjectedBundle(const WebCore::String&);
+    void registerURLSchemeAsEmptyDocument(const WebCore::String&);
 
     // CoreIPC::Connection::Client