Changeset 54997 in webkit

Timestamp:

Feb 18, 2010 6:06:14 PM (14 years ago)

Author:

brettw@chromium.org

Message:

2010-02-12 Brett Wilson <​brettw@chromium.org>

Reviewed by Adam Barth.

Update the Google-URL version of KURL and the V8 bindings to the new
behavior of KURL.IsStandard.

​https://bugs.webkit.org/show_bug.cgi?id=34859

This is covered by fast/dom/Window/invalid-protocol.html

• bindings/v8/custom/V8LocationCustom.cpp: (WebCore::V8Location::protocolAccessorSetter):
• platform/KURLGoogle.cpp: (WebCore::KURL::setProtocol): (WebCore::KURL::isHierarchical):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/custom/V8LocationCustom.cpp (modified) (1 diff)
• platform/KURLGoogle.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-12  Brett Wilson  <brettw@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Update the Google-URL version of KURL and the V8 bindings to the new
+        behavior of KURL.IsStandard.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34859
+
+        This is covered by fast/dom/Window/invalid-protocol.html
+
+        * bindings/v8/custom/V8LocationCustom.cpp:
+        (WebCore::V8Location::protocolAccessorSetter):
+        * platform/KURLGoogle.cpp:
+        (WebCore::KURL::setProtocol):
+        (WebCore::KURL::isHierarchical):
+
 2010-02-18  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/bindings/v8/custom/V8LocationCustom.cpp

@@ -186 +186 @@
 
     KURL url = frame->loader()->url();
-    url.setProtocol(protocol);
+    if (!url.setProtocol(protocol)) {
+        throwError("Can't set protocol", V8Proxy::SyntaxError);
+        return;
+    }
 
     navigateIfAllowed(frame, url, false, false);

trunk/WebCore/platform/KURLGoogle.cpp

@@ -573 +573 @@
 bool KURL::setProtocol(const String& protocol)
 {
+    // Firefox and IE remove everything after the first ':'.
+    int separatorPosition = protocol.find(':');
+    String newProtocol = protocol.substring(0, separatorPosition);
+
+    // If KURL is given an invalid scheme, it returns failure without modifying
+    // the URL at all. This is in contrast to most other setters which modify
+    // the URL and set "m_isValid."
+    url_canon::RawCanonOutputT<char> canonProtocol;
+    url_parse::Component protocolComponent;
+    if (!url_canon::CanonicalizeScheme(newProtocol.characters(),
+                                       url_parse::Component(0, newProtocol.length()),
+                                       &canonProtocol, &protocolComponent)
+        || !protocolComponent.is_nonempty())
+        return false;
+
     KURLGooglePrivate::Replacements replacements;
-    replacements.SetScheme(CharactersOrEmpty(protocol),
-                           url_parse::Component(0, protocol.length()));
+    replacements.SetScheme(CharactersOrEmpty(newProtocol),
+                           url_parse::Component(0, newProtocol.length()));
     m_url.replaceComponents(replacements);
+
+    // isValid could be false but we still return true here. This is because
+    // WebCore or JS scripts can build up a URL by setting individual
+    // components, and a JS exception is based on the return value of this
+    // function. We want to throw the exception and stop the script only when
+    // its trying to set a bad protocol, and not when it maybe just hasn't
+    // finished building up its final scheme.
     return true;
 }
@@ -1016 +1038 @@
     return url_util::IsStandard(
         &m_url.utf8String().data()[m_url.m_parsed.scheme.begin],
-        m_url.utf8String().length(),
         m_url.m_parsed.scheme);
 }