[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 39dbe7084c804f83b66c180a43e323ce31eab2dc
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 19 13:01:10 2010 +0000

    2010-02-19  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed. Chromium build fix: reverting r54997 and r54998.
            This is a two-sided change that should be coordinated.
    
            * bindings/v8/custom/V8LocationCustom.cpp:
            (WebCore::V8Location::protocolAccessorSetter):
            * platform/KURLGoogle.cpp:
            (WebCore::KURL::setProtocol):
            (WebCore::KURL::isHierarchical):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55011 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2d1d8bd..872f8b4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-19  Pavel Feldman  <pfeldman at chromium.org>
+
+        Not reviewed. Chromium build fix: reverting r54997 and r54998.
+
+        * bindings/v8/custom/V8LocationCustom.cpp:
+        (WebCore::V8Location::protocolAccessorSetter):
+        * platform/KURLGoogle.cpp:
+        (WebCore::KURL::setProtocol):
+        (WebCore::KURL::isHierarchical):
+
 2010-02-17  Philippe Normand  <pnormand at igalia.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/bindings/v8/custom/V8LocationCustom.cpp b/WebCore/bindings/v8/custom/V8LocationCustom.cpp
index 880d4b2..b5df601 100644
--- a/WebCore/bindings/v8/custom/V8LocationCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8LocationCustom.cpp
@@ -185,10 +185,7 @@ void V8Location::protocolAccessorSetter(v8::Local<v8::String> name, v8::Local<v8
         return;
 
     KURL url = frame->loader()->url();
-    if (!url.setProtocol(protocol)) {
-        throwError("Can't set protocol", V8Proxy::SyntaxError);
-        return;
-    }
+    url.setProtocol(protocol);
 
     navigateIfAllowed(frame, url, false, false);
 }
diff --git a/WebCore/platform/KURLGoogle.cpp b/WebCore/platform/KURLGoogle.cpp
index 3b1401d..65ca346 100644
--- a/WebCore/platform/KURLGoogle.cpp
+++ b/WebCore/platform/KURLGoogle.cpp
@@ -572,32 +572,10 @@ String KURL::path() const
 
 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(newProtocol),
-                           url_parse::Component(0, newProtocol.length()));
+    replacements.SetScheme(CharactersOrEmpty(protocol),
+                           url_parse::Component(0, protocol.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;
 }
 
@@ -1037,6 +1015,7 @@ bool KURL::isHierarchical() const
         return false;
     return url_util::IsStandard(
         &m_url.utf8String().data()[m_url.m_parsed.scheme.begin],
+        m_url.utf8String().length(),
         m_url.m_parsed.scheme);
 }
 
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index cc71398..b70f325 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,11 @@
 2010-02-19  Pavel Feldman  <pfeldman at chromium.org>
 
+        Not reviewed. Chromium build fix: reverting r54997 and r54998.
+
+        * DEPS:
+
+2010-02-19  Pavel Feldman  <pfeldman at chromium.org>
+
         Not reviewed. Chromium tests fix: update devtools code to match new
         web inspector object proxy format.
 
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index 3eead1d..9c45b83 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -36,7 +36,7 @@ vars = {
 
   # Dependencies' revisions to use:
   'chromium_rev': '38580',
-  'google-url_rev': '123',
+  'google-url_rev': '121',
   'gtest_rev': '359',
   'gyp_rev': '781',
   'icu_rev': '37341',

-- 
WebKit Debian packaging