Modified: trunk/LayoutTests/ChangeLog (86886 => 86887)
--- trunk/LayoutTests/ChangeLog 2011-05-19 20:36:01 UTC (rev 86886)
+++ trunk/LayoutTests/ChangeLog 2011-05-19 20:39:10 UTC (rev 86887)
@@ -1,3 +1,13 @@
+2011-05-15 Robert Hogan <[email protected]>
+
+ Reviewed by Antonio Gomes.
+
+ [Qt][GTK] plugins/get-url-with-_javascript_-url.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=60834
+ Fix unix test plugin for plugins/get-url-with-_javascript_-url.html
+
+ * platform/qt/Skipped:
+
2011-05-19 Justin Schuh <[email protected]>
Unreviewed.
Modified: trunk/LayoutTests/platform/qt/Skipped (86886 => 86887)
--- trunk/LayoutTests/platform/qt/Skipped 2011-05-19 20:36:01 UTC (rev 86886)
+++ trunk/LayoutTests/platform/qt/Skipped 2011-05-19 20:39:10 UTC (rev 86887)
@@ -2527,6 +2527,3 @@
fast/events/remove-target-in-mouseup-twice.html
fast/events/remove-target-in-mouseup.html
-# [Qt][GTK] plugins/get-url-with-_javascript_-url.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=60834
-plugins/get-url-with-_javascript_-url.html
Modified: trunk/Tools/ChangeLog (86886 => 86887)
--- trunk/Tools/ChangeLog 2011-05-19 20:36:01 UTC (rev 86886)
+++ trunk/Tools/ChangeLog 2011-05-19 20:39:10 UTC (rev 86887)
@@ -1,3 +1,16 @@
+2011-05-15 Robert Hogan <[email protected]>
+
+ Reviewed by Antonio Gomes.
+
+ [Qt][GTK] plugins/get-url-with-_javascript_-url.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=60834
+ Fix unix test plugin for plugins/get-url-with-_javascript_-url.html
+
+ * DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:
+ (webkit_test_plugin_new_stream):
+ (webkit_test_plugin_write_ready):
+ (webkit_test_plugin_write):
+
2011-05-19 Sheriff Bot <[email protected]>
Unreviewed, rolling out r86869, r86873, r86875, and r86877.
Modified: trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp (86886 => 86887)
--- trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp 2011-05-19 20:36:01 UTC (rev 86886)
+++ trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp 2011-05-19 20:39:10 UTC (rev 86887)
@@ -195,9 +195,9 @@
static NPError
webkit_test_plugin_new_stream(NPP instance,
- NPMIMEType /*type*/,
+ NPMIMEType type,
NPStream *stream,
- NPBool /*seekable*/,
+ NPBool seekable,
uint16_t* stype)
{
PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
@@ -213,7 +213,7 @@
if (obj->onStreamLoad)
executeScript(obj, obj->onStreamLoad);
- return NPERR_NO_ERROR;
+ return obj->pluginTest->NPP_NewStream(type, stream, seekable, stype);
}
static NPError
@@ -253,24 +253,25 @@
}
static int32_t
-webkit_test_plugin_write_ready(NPP /*instance*/, NPStream* /*stream*/)
+webkit_test_plugin_write_ready(NPP instance, NPStream* stream)
{
- return 4096;
+ PluginObject* obj = (PluginObject*)instance->pdata;
+ return obj->pluginTest->NPP_WriteReady(stream);
}
static int32_t
webkit_test_plugin_write(NPP instance,
- NPStream* /*stream*/,
- int32_t /*offset*/,
+ NPStream* stream,
+ int32_t offset,
int32_t len,
- void* /*buffer*/)
+ void* buffer)
{
PluginObject* obj = (PluginObject*)instance->pdata;
if (obj->returnNegativeOneFromWrite)
return -1;
- return len;
+ return obj->pluginTest->NPP_Write(stream, offset, len, buffer);
}
static void
