Changeset 108450 in webkit

Timestamp:

Feb 21, 2012 11:28:04 PM (12 years ago)

Author:

abarth@webkit.org

Message:

Separate the implementation of registerProtocolHandler from Navigator.cpp
​https://bugs.webkit.org/show_bug.cgi?id=78945

Reviewed by Eric Seidel.

The implementation of registerProtocolHandler needlessly complicates
the implementation of Navigator.cpp. In principle,
registerProtocolHandler (and possibly registerContentHandler, when we
implement that feature) could be its own module, but that seems like
overkill for one or two files.

• CMakeLists.txt:
• GNUmakefile.list.am:
• Target.pri:
• WebCore.gypi:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• page/Navigator.cpp:

(WebCore):

• page/Navigator.h:

(Navigator):

• page/Navigator.idl:

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (1 diff)
• Target.pri (modified) (1 diff)
• WebCore.gypi (modified) (2 diffs)
• WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (14 diffs)
• page/Navigator.cpp (modified) (2 diffs)
• page/Navigator.h (modified) (1 diff)
• page/Navigator.idl (modified) (1 diff)
• page/NavigatorRegisterProtocolHandler.cpp (added)
• page/NavigatorRegisterProtocolHandler.h (added)
• page/NavigatorRegisterProtocolHandler.idl (added)

trunk/Source/WebCore/CMakeLists.txt

@@ -1031 +1031 @@
     page/Navigator.cpp
     page/NavigatorBase.cpp
+    page/NavigatorRegisterProtocolHandler.cpp
     page/NavigatorSupplement.cpp
     page/OriginAccessEntry.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-21  Adam Barth  <abarth@webkit.org>
+
+        Separate the implementation of registerProtocolHandler from Navigator.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=78945
+
+        Reviewed by Eric Seidel.
+
+        The implementation of registerProtocolHandler needlessly complicates
+        the implementation of Navigator.cpp.  In principle,
+        registerProtocolHandler (and possibly registerContentHandler, when we
+        implement that feature) could be its own module, but that seems like
+        overkill for one or two files.
+
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * Target.pri:
+        * WebCore.gypi:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * page/Navigator.cpp:
+        (WebCore):
+        * page/Navigator.h:
+        (Navigator):
+        * page/Navigator.idl:
+
 2012-02-21  MORITA Hajime  <morrita@google.com>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -2741 +2741 @@
         Source/WebCore/page/NavigatorBase.cpp \
         Source/WebCore/page/NavigatorBase.h \
+        Source/WebCore/page/NavigatorRegisterProtocolHandler.cpp \
+        Source/WebCore/page/NavigatorRegisterProtocolHandler.h \
         Source/WebCore/page/NavigatorSupplement.cpp \
         Source/WebCore/page/NavigatorSupplement.h \

trunk/Source/WebCore/Target.pri

@@ -1002 +1002 @@
     page/Navigator.cpp \
     page/NavigatorBase.cpp \
+    page/NavigatorRegisterProtocolHandler.cpp \
     page/NavigatorSupplement.cpp \
     page/OriginAccessEntry.cpp \

trunk/Source/WebCore/WebCore.gypi

@@ -1013 +1013 @@
             'page/MemoryInfo.idl',
             'page/Navigator.idl',
+            'page/NavigatorRegisterProtocolHandler.idl',
             'page/Performance.idl',
             'page/PerformanceNavigation.idl',
@@ -2643 +2644 @@
             'page/NavigatorBase.cpp',
             'page/NavigatorBase.h',
+            'page/NavigatorRegisterProtocolHandler.cpp',
+            'page/NavigatorRegisterProtocolHandler.h',
             'page/NavigatorSupplement.cpp',
             'page/NavigatorSupplement.h',

trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -25587 +25587 @@
                         </File>
                         <File
+                                RelativePath="..\page\NavigatorRegisterProtocolHandler.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\page\NavigatorRegisterProtocolHandler.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\page\NavigatorSupplement.cpp"
                                 >

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -3460 +3460 @@
                 97E4028F13A696ED00913D67 /* IconController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97E4028D13A696ED00913D67 /* IconController.cpp */; };
                 97E4029013A696ED00913D67 /* IconController.h in Headers */ = {isa = PBXBuildFile; fileRef = 97E4028E13A696ED00913D67 /* IconController.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                97E4A12614F4C5D400870E43 /* NavigatorRegisterProtocolHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 9730BE1514EF286B00DF06B9 /* NavigatorRegisterProtocolHandler.h */; };
+                97E4A12714F4C5D700870E43 /* NavigatorRegisterProtocolHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9730BE1414EF286B00DF06B9 /* NavigatorRegisterProtocolHandler.cpp */; };
                 97EF7DFE107E55B700D7C49C /* ScriptControllerBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97EF7DFD107E55B700D7C49C /* ScriptControllerBase.cpp */; };
                 984264F112D5280A000D88A4 /* LinkLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 984264EF12D5280A000D88A4 /* LinkLoaderClient.h */; };
@@ -10204 +10206 @@
                 9728C3111268E4390041E89B /* MarkupAccumulator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MarkupAccumulator.cpp; sourceTree = "<group>"; };
                 9728C3121268E4390041E89B /* MarkupAccumulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarkupAccumulator.h; sourceTree = "<group>"; };
+                9730BE1414EF286B00DF06B9 /* NavigatorRegisterProtocolHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigatorRegisterProtocolHandler.cpp; sourceTree = "<group>"; };
+                9730BE1514EF286B00DF06B9 /* NavigatorRegisterProtocolHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigatorRegisterProtocolHandler.h; sourceTree = "<group>"; };
+                9730BE1614EF286B00DF06B9 /* NavigatorRegisterProtocolHandler.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NavigatorRegisterProtocolHandler.idl; sourceTree = "<group>"; };
                 9738899E116EA9DC00ADF313 /* DocumentWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentWriter.cpp; sourceTree = "<group>"; };
                 9738899F116EA9DC00ADF313 /* DocumentWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentWriter.h; sourceTree = "<group>"; };
@@ -15283 +15288 @@
                                 E12719C90EEEC21300F61213 /* NavigatorBase.cpp */,
                                 E12719C60EEEC16800F61213 /* NavigatorBase.h */,
+                                9730BE1414EF286B00DF06B9 /* NavigatorRegisterProtocolHandler.cpp */,
+                                9730BE1514EF286B00DF06B9 /* NavigatorRegisterProtocolHandler.h */,
+                                9730BE1614EF286B00DF06B9 /* NavigatorRegisterProtocolHandler.idl */,
                                 97CC3AE014E8E4A200894988 /* NavigatorSupplement.cpp */,
                                 97CC3AE114E8E4A200894988 /* NavigatorSupplement.h */,
@@ -19214 +19222 @@
                         isa = PBXGroup;
                         children = (
-                                A83B533814F399BB00720D9D /* IDLAttributes.txt */,
                                 B5D31DF711CF60E5009F22B4 /* generic */,
                                 BC1A3793097C6FB10019F3D8 /* js */,
@@ -19220 +19227 @@
                                 93F8B3050A300FE100F61AB8 /* CodeGenerator.pm */,
                                 93F8B3070A300FEA00F61AB8 /* generate-bindings.pl */,
+                                A83B533814F399BB00720D9D /* IDLAttributes.txt */,
                                 14813BF309EDF88E00F757E1 /* IDLParser.pm */,
                                 93F8B3080A300FEA00F61AB8 /* IDLStructure.pm */,
@@ -22359 +22367 @@
                                 41885B9311B6FDA6003383BB /* FormSubmission.h in Headers */,
                                 935C476D09AC4D6300A6AAB4 /* FoundationExtras.h in Headers */,
+                                144FCFE114EF2509000D17A3 /* FractionalLayoutRect.h in Headers */,
                                 144FCE5D14EC79E7000D17A3 /* FractionalLayoutSize.h in Headers */,
                                 144FCE5214EC79BC000D17A3 /* FractionalLayoutUnit.h in Headers */,
@@ -23314 +23323 @@
                                 E12719C70EEEC16800F61213 /* NavigatorBase.h in Headers */,
                                 9711460414EF009A00674FD9 /* NavigatorGeolocation.h in Headers */,
+                                97E4A12614F4C5D400870E43 /* NavigatorRegisterProtocolHandler.h in Headers */,
                                 97CC3AE314E8E4A200894988 /* NavigatorSupplement.h in Headers */,
                                 8A309C9F123950BE00CB9204 /* NestingLevelIncrementer.h in Headers */,
@@ -23450 +23460 @@
                                 A715E653134BBBEC00D8E713 /* ProgressShadowElement.h in Headers */,
                                 1A2A68240B5BEDE70002A480 /* ProgressTracker.h in Headers */,
+                                E4BBED0F14F4025D003F0B98 /* PropertySetCSSStyleDeclaration.h in Headers */,
                                 514C76750CE923A1007EF3CD /* ProtectionSpace.h in Headers */,
                                 51A052561058874000CC9E95 /* ProtectionSpaceHash.h in Headers */,
@@ -24322 +24333 @@
                                 977E2E0F12F0FC9C00C13379 /* XSSAuditor.h in Headers */,
                                 FD537353137B651800008DCE /* ZeroPole.h in Headers */,
-                                E4BBED0F14F4025D003F0B98 /* PropertySetCSSStyleDeclaration.h in Headers */,
-                                144FCFE114EF2509000D17A3 /* FractionalLayoutRect.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -25435 +25444 @@
                                 656D373B0ADBA5DE00A4554D /* FormState.cpp in Sources */,
                                 41885B9411B6FDA6003383BB /* FormSubmission.cpp in Sources */,
+                                144FCFE014EF2509000D17A3 /* FractionalLayoutRect.cpp in Sources */,
                                 144FCE5C14EC79E7000D17A3 /* FractionalLayoutSize.cpp in Sources */,
                                 65BF022E0974816300C43196 /* Frame.cpp in Sources */,
@@ -26470 +26480 @@
                                 E12719CA0EEEC21300F61213 /* NavigatorBase.cpp in Sources */,
                                 9711460314EF009A00674FD9 /* NavigatorGeolocation.cpp in Sources */,
+                                97E4A12714F4C5D700870E43 /* NavigatorRegisterProtocolHandler.cpp in Sources */,
                                 97CC3AE214E8E4A200894988 /* NavigatorSupplement.cpp in Sources */,
                                 5D874F130D161D3200796C3B /* NetscapePlugInStreamLoader.cpp in Sources */,
@@ -26565 +26576 @@
                                 A715E652134BBBEC00D8E713 /* ProgressShadowElement.cpp in Sources */,
                                 1A2A68230B5BEDE70002A480 /* ProgressTracker.cpp in Sources */,
+                                E4BBED0E14F4025D003F0B98 /* PropertySetCSSStyleDeclaration.cpp in Sources */,
                                 514C76740CE923A1007EF3CD /* ProtectionSpace.cpp in Sources */,
                                 1AF8E13312565A4400230FF7 /* ProxyServer.cpp in Sources */,
@@ -27192 +27204 @@
                                 518A34C11026C831001B6896 /* WebSocket.cpp in Sources */,
                                 510D4A4E103177A20049EA54 /* WebSocketChannel.cpp in Sources */,
+                                4AE02ABD14E8A9D200BC3BA7 /* WebSocketDeflater.cpp in Sources */,
                                 4A957F0614E2412A0049DBFB /* WebSocketExtensionDispatcher.cpp in Sources */,
-                                4AE02ABD14E8A9D200BC3BA7 /* WebSocketDeflater.cpp in Sources */,
                                 51ABAE441043AB4A008C5260 /* WebSocketHandshake.cpp in Sources */,
                                 7637C541112E7B74003D6CDC /* WebSocketHandshakeRequest.cpp in Sources */,
@@ -27271 +27283 @@
                                 977E2E0E12F0FC9C00C13379 /* XSSAuditor.cpp in Sources */,
                                 FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
-                                E4BBED0E14F4025D003F0B98 /* PropertySetCSSStyleDeclaration.cpp in Sources */,
-                                144FCFE014EF2509000D17A3 /* FractionalLayoutRect.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/Source/WebCore/page/Navigator.cpp

@@ -24 +24 @@
 #include "Navigator.h"
 
-#include "Chrome.h"
 #include "CookieJar.h"
 #include "DOMMimeTypeArray.h"
 #include "DOMPluginArray.h"
 #include "Document.h"
-#include "ExceptionCode.h"
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "Geolocation.h"
+#include "Page.h"
 #include "PointerLock.h"
-#include "KURL.h"
 #include "Language.h"
-#include "Page.h"
-#include "PageGroup.h"
-#include "PlatformString.h"
 #include "PluginData.h"
 #include "Settings.h"
@@ -160 +155 @@
 }
 
-#if ENABLE(REGISTER_PROTOCOL_HANDLER)
-static HashSet<String>* protocolWhitelist;
-
-static void initProtocolHandlerWhitelist()
-{
-    protocolWhitelist = new HashSet<String>;
-    static const char* protocols[] = {
-        "irc",
-        "mailto",
-        "mms",
-        "news",
-        "nntp",
-        "sms",
-        "smsto",
-        "tel",
-        "urn",
-        "webcal",
-    };
-    for (size_t i = 0; i < WTF_ARRAY_LENGTH(protocols); ++i)
-        protocolWhitelist->add(protocols[i]);
-}
-
-static bool verifyCustomHandlerURL(const String& baseURL, const String& url, ExceptionCode& ec)
-{
-    // The specification requires that it is a SYNTAX_ERR if the "%s" token is
-    // not present.
-    static const char token[] = "%s";
-    int index = url.find(token);
-    if (-1 == index) {
-        ec = SYNTAX_ERR;
-        return false;
-    }
-
-    // It is also a SYNTAX_ERR if the custom handler URL, as created by removing
-    // the "%s" token and prepending the base url, does not resolve.
-    String newURL = url;
-    newURL.remove(index, WTF_ARRAY_LENGTH(token) - 1);
-
-    KURL base(ParsedURLString, baseURL);
-    KURL kurl(base, newURL);
-
-    if (kurl.isEmpty() || !kurl.isValid()) {
-        ec = SYNTAX_ERR;
-        return false;
-    }
-
-    return true;
-}
-
-static bool isProtocolWhitelisted(const String& scheme)
-{
-    if (!protocolWhitelist)
-        initProtocolHandlerWhitelist();
-    return protocolWhitelist->contains(scheme);
-}
-
-static bool verifyProtocolHandlerScheme(const String& scheme, ExceptionCode& ec)
-{
-    if (scheme.startsWith("web+")) {
-        if (isValidProtocol(scheme))
-            return true;
-        ec = SECURITY_ERR;
-        return false;
-    }
-
-    if (isProtocolWhitelisted(scheme))
-        return true;
-    ec = SECURITY_ERR;
-    return false;
-}
-
-void Navigator::registerProtocolHandler(const String& scheme, const String& url, const String& title, ExceptionCode& ec)
-{
-    if (!m_frame)
-        return;
-
-    Document* document = m_frame->document();
-    if (!document)
-        return;
-
-    String baseURL = document->baseURL().baseAsString();
-
-    if (!verifyCustomHandlerURL(baseURL, url, ec))
-        return;
-
-    if (!verifyProtocolHandlerScheme(scheme, ec))
-        return;
-
-    Page* page = m_frame->page();
-    if (!page)
-        return;
-
-    page->chrome()->registerProtocolHandler(scheme, baseURL, url, m_frame->displayStringModifiedByEncoding(title));
-}
-#endif
-
 } // namespace WebCore

trunk/Source/WebCore/page/Navigator.h

@@ -61 +61 @@
     void getStorageUpdates();
 
-#if ENABLE(REGISTER_PROTOCOL_HANDLER)
-    void registerProtocolHandler(const String& scheme, const String& url, const String& title, ExceptionCode&);
-#endif
-
     void provideSupplement(const AtomicString&, PassOwnPtr<NavigatorSupplement>);
     NavigatorSupplement* requireSupplement(const AtomicString&);

trunk/Source/WebCore/page/Navigator.idl

@@ -46 +46 @@
 
         void getStorageUpdates(); // FIXME: Remove this method or rename to yieldForStorageUpdates.
-
-#if defined(ENABLE_REGISTER_PROTOCOL_HANDLER) && ENABLE_REGISTER_PROTOCOL_HANDLER
-        void registerProtocolHandler(in DOMString scheme, in DOMString url, in DOMString title)
-            raises(DOMException);
-#endif
     };