[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[zecke at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit ddcfd3fd7d419ea7e6b3583588f7961478c3d5eb
Author: zecke at webkit.org <zecke at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 26 10:31:16 2009 +0000

    Fix compilation of REQUEST_DEBUG debug code
    
    https://bugs.webkit.org/show_bug.cgi?id=31850
    
    In r47907 the single parameter KURL constructor to parse
    from a WebCore::String was replaced with a two parameter
    constructor. I think in this debug case parsing the urls
    again is no problem and I have changed the code to use the
    two parameter version.
    
    * loader/loader.cpp:
    (WebCore::Loader::Host::didFinishLoading):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51408 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e314ac1..120f288 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2009-11-24  Holger Hans Peter Freyther  <zecke at selfish.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Fix compilation of REQUEST_DEBUG debug code
+        https://bugs.webkit.org/show_bug.cgi?id=31850
+
+        In r47907 the single parameter KURL constructor to parse
+        from a WebCore::String was replaced with a two parameter
+        constructor. I think in this debug case parsing the urls
+        again is no problem and I have changed the code to use the
+        two parameter version.
+
+        * loader/loader.cpp:
+        (WebCore::Loader::Host::didFinishLoading):
+
 2009-11-26  Søren Gjesse  <sgjesse at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/loader/loader.cpp b/WebCore/loader/loader.cpp
index 0b6dff1..695a034 100644
--- a/WebCore/loader/loader.cpp
+++ b/WebCore/loader/loader.cpp
@@ -375,7 +375,7 @@ void Loader::Host::didFinishLoading(SubresourceLoader* loader)
     docLoader->checkForPendingPreloads();
 
 #if REQUEST_DEBUG
-    KURL u(resource->url());
+    KURL u(ParsedURLString, resource->url());
     printf("HOST %s COUNT %d RECEIVED %s\n", u.host().latin1().data(), m_requestsLoading.size(), resource->url().latin1().data());
 #endif
     servePendingRequests();

-- 
WebKit Debian packaging