Changeset 80430 in webkit

Timestamp:

Mar 5, 2011 3:38:17 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-03-05 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r80428.
​http://trac.webkit.org/changeset/80428
​https://bugs.webkit.org/show_bug.cgi?id=55833

Broke SnowLeopard (Requested by xan_ on #webkit).

• http/tests/plugins/resources/dump-post.pl:
• platform/gtk/Skipped:

2011-03-05 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r80428.
​http://trac.webkit.org/changeset/80428
​https://bugs.webkit.org/show_bug.cgi?id=55833

Broke SnowLeopard (Requested by xan_ on #webkit).

• plugins/gtk/PluginViewGtk.cpp: (WebCore::PluginView::handlePostReadFile):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/plugins/resources/dump-post.pl (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/plugins/gtk/PluginViewGtk.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-03-05  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r80428.
+        http://trac.webkit.org/changeset/80428
+        https://bugs.webkit.org/show_bug.cgi?id=55833
+
+        Broke SnowLeopard (Requested by xan_ on #webkit).
+
+        * http/tests/plugins/resources/dump-post.pl:
+        * platform/gtk/Skipped:
+
 2011-03-05  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/http/tests/plugins/resources/dump-post.pl

@@ -8 +8 @@
 
 print $cgi->header('text/plain');
-print $cgi->param('POSTDATA');
+print $cgi->param('keywords');

trunk/LayoutTests/platform/gtk/Skipped

@@ -514 +514 @@
 
 http/tests/plugins/npapi-response-headers.html
+http/tests/plugins/post-url-file.html
 http/tests/security/feed-urls-from-remote.html
 http/tests/security/mixedContent/insecure-css-in-main-frame.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-05  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r80428.
+        http://trac.webkit.org/changeset/80428
+        https://bugs.webkit.org/show_bug.cgi?id=55833
+
+        Broke SnowLeopard (Requested by xan_ on #webkit).
+
+        * plugins/gtk/PluginViewGtk.cpp:
+        (WebCore::PluginView::handlePostReadFile):
+
 2011-03-01  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/plugins/gtk/PluginViewGtk.cpp

@@ -560 +560 @@
 }
 
-NPError PluginView::handlePostReadFile(Vector<char>& outputBuffer, uint32_t filenameLength, const char* filenameBuffer)
-{
-    // There doesn't seem to be any documentation about what encoding the filename
-    // is in, but most ports seem to assume UTF-8 here and the test plugin is definitely
-    // sending the path in UTF-8 encoding.
-    CString filename(filenameBuffer, filenameLength);
-
-    GRefPtr<GFile> file = adoptGRef(g_file_new_for_commandline_arg(filename.data()));
-    if (g_file_query_file_type(file.get(), G_FILE_QUERY_INFO_NONE, 0) != G_FILE_TYPE_REGULAR)
+NPError PluginView::handlePostReadFile(Vector<char>& buffer, uint32_t len, const char* buf)
+{
+    WTF::String filename(buf, len);
+
+    if (filename.startsWith("file:///"))
+        filename = filename.substring(8);
+
+    // Get file info
+    if (!g_file_test ((filename.utf8()).data(), (GFileTest)(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)))
         return NPERR_FILE_NOT_FOUND;
 
-    GRefPtr<GFileInfo> fileInfo = adoptGRef(g_file_query_info(file.get(),
-                                                              G_FILE_ATTRIBUTE_STANDARD_SIZE,
-                                                              G_FILE_QUERY_INFO_NONE,
-                                                              0, 0));
-    if (!fileInfo)
+    //FIXME - read the file data into buffer
+    FILE* fileHandle = fopen((filename.utf8()).data(), "r");
+    
+    if (fileHandle == 0)
         return NPERR_FILE_NOT_FOUND;
 
-    GRefPtr<GFileInputStream> inputStream = adoptGRef(g_file_read(file.get(), 0, 0));
-    if (!inputStream)
-        return NPERR_FILE_NOT_FOUND;
-
-    outputBuffer.resize(g_file_info_get_size(fileInfo.get()));
-    gsize bytesRead = 0;
-    if (!g_input_stream_read_all(G_INPUT_STREAM(inputStream.get()),
-                                 outputBuffer.data(), outputBuffer.size(), &bytesRead, 0, 0))
+    //buffer.resize();
+
+    int bytesRead = fread(buffer.data(), 1, 0, fileHandle);
+
+    fclose(fileHandle);
+
+    if (bytesRead <= 0)
         return NPERR_FILE_NOT_FOUND;