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

barraclough at apple.com barraclough at apple.com
Wed Dec 22 11:51:27 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 59770a0bc21a9a507170fdec815756dff10b006f
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 10 01:28:39 2010 +0000

    Speculative gtk build fix.
    
    * plugins/gtk/PluginViewGtk.cpp:
    (WebCore::PluginView::handlePostReadFile):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65025 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a940343..b942b56 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-09  Gavin Barraclough  <barraclough at apple.com>
+
+        Speculative gtk build fix.
+
+        * plugins/gtk/PluginViewGtk.cpp:
+        (WebCore::PluginView::handlePostReadFile):
+
 2010-08-06  Gavin Barraclough  <barraclough at apple.com>
 
         Rubber stamped by Sam Weinig
diff --git a/WebCore/plugins/gtk/PluginViewGtk.cpp b/WebCore/plugins/gtk/PluginViewGtk.cpp
index 78c6636..ab43bf4 100644
--- a/WebCore/plugins/gtk/PluginViewGtk.cpp
+++ b/WebCore/plugins/gtk/PluginViewGtk.cpp
@@ -556,7 +556,7 @@ void PluginView::setParentVisible(bool visible)
 
 NPError PluginView::handlePostReadFile(Vector<char>& buffer, uint32_t len, const char* buf)
 {
-    String filename(buf, len);
+    WTF::String filename(buf, len);
 
     if (filename.startsWith("file:///"))
         filename = filename.substring(8);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list