Diff
Modified: trunk/LayoutTests/ChangeLog (144223 => 144224)
--- trunk/LayoutTests/ChangeLog 2013-02-27 20:37:12 UTC (rev 144223)
+++ trunk/LayoutTests/ChangeLog 2013-02-27 20:38:31 UTC (rev 144224)
@@ -1,3 +1,18 @@
+2013-02-27 Jochen Eisinger <[email protected]>
+
+ plugins/netscape-plugin-setwindow-size*.html and plugins/pass-different-npp-struct.html should be async
+ https://bugs.webkit.org/show_bug.cgi?id=110973
+
+ Reviewed by Adam Barth.
+
+ There is nothing that ensures that the log messages from the plugin
+ come in before the layout test finished loading.
+
+ * platform/mac-wk2/plugins/netscape-plugin-setwindow-size-2-expected.txt: Removed.
+ * plugins/netscape-plugin-setwindow-size-2.html:
+ * plugins/netscape-plugin-setwindow-size.html:
+ * plugins/pass-different-npp-struct.html:
+
2013-02-27 Manuel Rego Casasnovas <[email protected]>
Add smartInsertDeleteEnabled setting to WebCore::Page
Deleted: trunk/LayoutTests/platform/mac-wk2/plugins/netscape-plugin-setwindow-size-2-expected.txt (144223 => 144224)
--- trunk/LayoutTests/platform/mac-wk2/plugins/netscape-plugin-setwindow-size-2-expected.txt 2013-02-27 20:37:12 UTC (rev 144223)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/netscape-plugin-setwindow-size-2-expected.txt 2013-02-27 20:38:31 UTC (rev 144224)
@@ -1 +0,0 @@
-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 (144223 => 144224)
--- trunk/LayoutTests/plugins/netscape-plugin-setwindow-size-2.html 2013-02-27 20:37:12 UTC (rev 144223)
+++ trunk/LayoutTests/plugins/netscape-plugin-setwindow-size-2.html 2013-02-27 20:38:31 UTC (rev 144224)
@@ -3,6 +3,7 @@
<script>
if (window.testRunner) {
testRunner.dumpAsText();
+ testRunner.waitUntilDone();
testRunner.setWindowIsKey(false);
}
Modified: trunk/LayoutTests/plugins/netscape-plugin-setwindow-size.html (144223 => 144224)
--- trunk/LayoutTests/plugins/netscape-plugin-setwindow-size.html 2013-02-27 20:37:12 UTC (rev 144223)
+++ trunk/LayoutTests/plugins/netscape-plugin-setwindow-size.html 2013-02-27 20:38:31 UTC (rev 144224)
@@ -1,8 +1,10 @@
<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 (144223 => 144224)
--- trunk/LayoutTests/plugins/pass-different-npp-struct.html 2013-02-27 20:37:12 UTC (rev 144223)
+++ trunk/LayoutTests/plugins/pass-different-npp-struct.html 2013-02-27 20:38:31 UTC (rev 144224)
@@ -11,8 +11,10 @@
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 (144223 => 144224)
--- trunk/Tools/ChangeLog 2013-02-27 20:37:12 UTC (rev 144223)
+++ trunk/Tools/ChangeLog 2013-02-27 20:38:31 UTC (rev 144224)
@@ -1,3 +1,18 @@
+2013-02-27 Jochen Eisinger <[email protected]>
+
+ plugins/netscape-plugin-setwindow-size*.html and plugins/pass-different-npp-struct.html should be async
+ https://bugs.webkit.org/show_bug.cgi?id=110973
+
+ Reviewed by Adam Barth.
+
+ There is nothing that ensures that the log messages from the plugin
+ come in before the layout test finished loading.
+
+ * DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp:
+ (PassDifferentNPPStruct::NPP_SetWindow):
+ * DumpRenderTree/TestNetscapePlugIn/main.cpp:
+ (NPP_SetWindow):
+
2013-02-27 Glenn Adams <[email protected]>
Add ENABLE_CSS3_TEXT_LINE_BREAK flag.
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp (144223 => 144224)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp 2013-02-27 20:37:12 UTC (rev 144223)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp 2013-02-27 20:38:31 UTC (rev 144224)
@@ -58,9 +58,11 @@
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 (144223 => 144224)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp 2013-02-27 20:37:12 UTC (rev 144223)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp 2013-02-27 20:38:31 UTC (rev 144224)
@@ -351,6 +351,7 @@
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)
