[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[brettw at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit e37f81e3c6179bf5238e8ae5a756f518b3108166
Author: brettw at chromium.org <brettw at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 11 18:38:03 2010 +0000

    010-03-08  Brett Wilson  <brettw at chromium.org>
    
            Reviewed by Adam Barth.
    
            Remove the deprecated argument to url_util::IsStandard in preparation
            for deleting that version of the function. Pull the latest googleurl
            with the new version for the Chromium builder.
    
            * platform/KURLGoogle.cpp:
            (WebCore::KURL::isHierarchical):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55846 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 68744cd..8bb911e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-08  Brett Wilson  <brettw at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Remove the deprecated argument to url_util::IsStandard in preparation
+        for deleting that version of the function. Pull the latest googleurl
+        with the new version for the Chromium builder.
+
+        * platform/KURLGoogle.cpp:
+        (WebCore::KURL::isHierarchical):
+
 2010-03-11  Simon Hausmann  <simon.hausmann at nokia.com>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/WebCore/platform/KURLGoogle.cpp b/WebCore/platform/KURLGoogle.cpp
index 602e602..8be7009 100644
--- a/WebCore/platform/KURLGoogle.cpp
+++ b/WebCore/platform/KURLGoogle.cpp
@@ -1037,7 +1037,6 @@ 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/DEPS b/WebKit/chromium/DEPS
index 3b566f5..7244505 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -36,7 +36,7 @@ vars = {
 
   # Dependencies' revisions to use:
   'chromium_rev': '38580',
-  'google-url_rev': '121',
+  'google-url_rev': '125',
   'gtest_rev': '359',
   'gyp_rev': '790',
   'icu_rev': '37341',

-- 
WebKit Debian packaging