[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 34717b57ad63e4f77ddd5dd86573d3e2e46fc5f6
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 30 14:58:29 2009 +0000

    2009-12-30  Jakub Wieczorek  <faw217 at gmail.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Fix PluginView::handlePostReadFile().
            https://bugs.webkit.org/show_bug.cgi?id=33052
    
            The function should actually rewrite the given file to the buffer.
    
            This change fixes http/tests/plugins/post-url-file.html, which can be unskipped
            now along with other passing http/plugins tests.
    
            * plugins/qt/PluginViewQt.cpp:
            (WebCore::PluginView::handlePostReadFile):
    2009-12-30  Jakub Wieczorek  <faw217 at gmail.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Fix PluginView::handlePostReadFile().
            https://bugs.webkit.org/show_bug.cgi?id=33052
    
            The function should actually rewrite the given file to the buffer.
    
            This change fixes http/tests/plugins/post-url-file.html, which can be unskipped
            now along with other passing http/plugins tests.
    
            * platform/qt/Skipped:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52660 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 52d40c1..2c5a5f9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-30  Jakub Wieczorek  <faw217 at gmail.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix PluginView::handlePostReadFile().
+        https://bugs.webkit.org/show_bug.cgi?id=33052
+
+        The function should actually rewrite the given file to the buffer.
+
+        This change fixes http/tests/plugins/post-url-file.html, which can be unskipped
+        now along with other passing http/plugins tests.
+
+        * platform/qt/Skipped:
+
 2009-12-30  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Skipping isolatedWorld test - we still do not support that.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index aba99e2..d7feee9 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -21,7 +21,6 @@ http/tests/globalhistory
 http/tests/history
 http/tests/incremental
 http/tests/media
-http/tests/plugins
 http/tests/webarchive
 http/tests/wml
 
@@ -35,6 +34,9 @@ http/tests/loading/redirect-methods.html
 http/tests/loading/simple-subframe.html
 http/tests/loading/text-content-type-with-binary-extension.html
 
+# Failing plugins tests
+http/tests/plugins/npapi-response-headers.html
+
 # Failing Local tests
 http/tests/local/drag-over-remote-content.html
 http/tests/local/send-dragged-file.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2b1421e..05169ea 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-12-30  Jakub Wieczorek  <faw217 at gmail.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix PluginView::handlePostReadFile().
+        https://bugs.webkit.org/show_bug.cgi?id=33052
+
+        The function should actually rewrite the given file to the buffer.
+
+        This change fixes http/tests/plugins/post-url-file.html, which can be unskipped
+        now along with other passing http/plugins tests.
+
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::PluginView::handlePostReadFile):
+
 2009-12-30  Holger Hans Peter Freyther  <zecke at selfish.org>
 
         Rubber stamped by Simon Hausmann.
diff --git a/WebCore/plugins/qt/PluginViewQt.cpp b/WebCore/plugins/qt/PluginViewQt.cpp
index b4ee48e..fb8ba08 100644
--- a/WebCore/plugins/qt/PluginViewQt.cpp
+++ b/WebCore/plugins/qt/PluginViewQt.cpp
@@ -529,18 +529,16 @@ NPError PluginView::handlePostReadFile(Vector<char>& buffer, uint32 len, const c
     if (filename.startsWith("file:///"))
         filename = filename.substring(8);
 
-    if (!fileExists(filename))
+    long long size;
+    if (!getFileSize(filename, size))
         return NPERR_FILE_NOT_FOUND;
 
-    // FIXME - read the file data into buffer
     FILE* fileHandle = fopen((filename.utf8()).data(), "r");
-
     if (!fileHandle)
         return NPERR_FILE_NOT_FOUND;
 
-    //buffer.resize();
-
-    int bytesRead = fread(buffer.data(), 1, 0, fileHandle);
+    buffer.resize(size);
+    int bytesRead = fread(buffer.data(), 1, size, fileHandle);
 
     fclose(fileHandle);
 

-- 
WebKit Debian packaging