Diff
Modified: trunk/LayoutTests/ChangeLog (144265 => 144266)
--- trunk/LayoutTests/ChangeLog 2013-02-28 07:50:22 UTC (rev 144265)
+++ trunk/LayoutTests/ChangeLog 2013-02-28 07:55:58 UTC (rev 144266)
@@ -1,3 +1,17 @@
+2013-02-27 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r144224.
+ http://trac.webkit.org/changeset/144224
+ https://bugs.webkit.org/show_bug.cgi?id=111045
+
+ Caused plugins/pass-different-npp-struct.html to time out
+ (Requested by abarth on #webkit).
+
+ * platform/mac-wk2/plugins/netscape-plugin-setwindow-size-2-expected.txt: Added.
+ * plugins/netscape-plugin-setwindow-size-2.html:
+ * plugins/netscape-plugin-setwindow-size.html:
+ * plugins/pass-different-npp-struct.html:
+
2013-02-27 Adam Barth <[email protected]>
Unreviewed.
Added: trunk/LayoutTests/platform/mac-wk2/plugins/netscape-plugin-setwindow-size-2-expected.txt (0 => 144266)
--- trunk/LayoutTests/platform/mac-wk2/plugins/netscape-plugin-setwindow-size-2-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/netscape-plugin-setwindow-size-2-expected.txt 2013-02-28 07:55:58 UTC (rev 144266)
@@ -0,0 +1 @@
+This tests that a hidden plug-in gets a correct NPP_SetWindow the first time.
Modified: trunk/LayoutTests/plugins/netscape-plugin-setwindow-size-2.html (144265 => 144266)
--- trunk/LayoutTests/plugins/netscape-plugin-setwindow-size-2.html 2013-02-28 07:50:22 UTC (rev 144265)
+++ trunk/LayoutTests/plugins/netscape-plugin-setwindow-size-2.html 2013-02-28 07:55:58 UTC (rev 144266)
@@ -3,7 +3,6 @@
<script>
if (window.testRunner) {
testRunner.dumpAsText();
- testRunner.waitUntilDone();
testRunner.setWindowIsKey(false);
}
Modified: trunk/LayoutTests/plugins/netscape-plugin-setwindow-size.html (144265 => 144266)
--- trunk/LayoutTests/plugins/netscape-plugin-setwindow-size.html 2013-02-28 07:50:22 UTC (rev 144265)
+++ trunk/LayoutTests/plugins/netscape-plugin-setwindow-size.html 2013-02-28 07:55:58 UTC (rev 144266)
@@ -1,10 +1,8 @@
<html>
<head>
<script>
- if (window.testRunner) {
+ if (window.testRunner)
testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
</script>
<body style="margin:0px;overflow:hidden">
<embed id="testPlugin" type="application/x-webkit-test-netscape" logfirstsetwindow="true" width="100%" height="200"></embed>
Modified: trunk/LayoutTests/plugins/pass-different-npp-struct.html (144265 => 144266)
--- trunk/LayoutTests/plugins/pass-different-npp-struct.html 2013-02-28 07:50:22 UTC (rev 144265)
+++ trunk/LayoutTests/plugins/pass-different-npp-struct.html 2013-02-28 07:55:58 UTC (rev 144266)
@@ -11,10 +11,8 @@
This tests that no assertions fire when a plugin passes a different NPP struct to one of the NPN* functions (specifically, NPN_GetValue).
</div>
<script>
- if (window.testRunner) {
+ if (window.testRunner)
testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
</script>
</body>
</html>
Modified: trunk/Tools/ChangeLog (144265 => 144266)
--- trunk/Tools/ChangeLog 2013-02-28 07:50:22 UTC (rev 144265)
+++ trunk/Tools/ChangeLog 2013-02-28 07:55:58 UTC (rev 144266)
@@ -1,3 +1,17 @@
+2013-02-27 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r144224.
+ http://trac.webkit.org/changeset/144224
+ https://bugs.webkit.org/show_bug.cgi?id=111045
+
+ Caused plugins/pass-different-npp-struct.html to time out
+ (Requested by abarth on #webkit).
+
+ * DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp:
+ (PassDifferentNPPStruct::NPP_SetWindow):
+ * DumpRenderTree/TestNetscapePlugIn/main.cpp:
+ (NPP_SetWindow):
+
2013-02-27 Adam Barth <[email protected]>
[Chromium] Enable threaded HTML parser by default in DumpRenderTree
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp (144265 => 144266)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp 2013-02-28 07:50:22 UTC (rev 144265)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp 2013-02-28 07:55:58 UTC (rev 144266)
@@ -58,11 +58,9 @@
if (error != NPERR_NO_ERROR) {
log("NPN_GetValue(NPNVprivateModeBool) with a different NPP struct failed with error %d", error);
- notifyDone();
return NPERR_GENERIC_ERROR;
}
log("NPN_GetValue(NPNVprivateModeBool) with a different NPP struct succeeded");
- notifyDone();
return NPERR_NO_ERROR;
}
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp (144265 => 144266)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp 2013-02-28 07:50:22 UTC (rev 144265)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp 2013-02-28 07:55:58 UTC (rev 144266)
@@ -351,7 +351,6 @@
if (obj->logSetWindow) {
pluginLog(instance, "NPP_SetWindow: %d %d", (int)window->width, (int)window->height);
obj->logSetWindow = FALSE;
- executeScript(obj, "testRunner.notifyDone();");
}
if (obj->onSetWindow)
