[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 15:34:14 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 7e10918b575d14a490c31cfce8bc0a6e1ea71266
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 8 16:48:08 2010 +0000

    2010-11-08  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Andreas Kling.
    
            [GTK] Error page templates are not filled properly
            https://bugs.webkit.org/show_bug.cgi?id=49148
    
            Replace a call to makeString with String::format. This was mistakenly
            changed to makeString in an earlier commit.
    
            * WebCoreSupport/FrameLoaderClientGtk.cpp:
            (WebKit::FrameLoaderClient::dispatchDidFailLoad):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71529 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 56d66a3..28a5c0f 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-08  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Andreas Kling.
+
+        [GTK] Error page templates are not filled properly
+        https://bugs.webkit.org/show_bug.cgi?id=49148
+
+        Replace a call to makeString with String::format. This was mistakenly
+        changed to makeString in an earlier commit.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::dispatchDidFailLoad):
+
 2010-11-08  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index bc2b5d9..b23bd70 100644
--- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -1139,7 +1139,7 @@ void FrameLoaderClient::dispatchDidFailLoad(const ResourceError& error)
         if (!loaded)
             content = makeString("<html><body>", webError->message, "</body></html>");
         else
-            content = makeString(fileContent, error.failingURL(), webError->message);
+            content = String::format(fileContent, error.failingURL().utf8().data(), webError->message);
     }
 
     webkit_web_frame_load_alternate_string(m_frame, content.utf8().data(), 0, error.failingURL().utf8().data());

-- 
WebKit Debian packaging

