git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9f5fa5b)
Unreviewed, rolling out r144224.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Feb 2013 07:55:58 +0000 (07:55 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Feb 2013 07:55:58 +0000 (07:55 +0000)
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).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-02-27

Tools:

* DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp:
(PassDifferentNPPStruct::NPP_SetWindow):
* DumpRenderTree/TestNetscapePlugIn/main.cpp:
(NPP_SetWindow):

LayoutTests:

* 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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@144266 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/platform/mac-wk2/plugins/netscape-plugin-setwindow-size-2-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/plugins/netscape-plugin-setwindow-size-2.html patch | blob | history
LayoutTests/plugins/netscape-plugin-setwindow-size.html patch | blob | history
LayoutTests/plugins/pass-different-npp-struct.html patch | blob | history
Tools/ChangeLog patch | blob | history
Tools/DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp patch | blob | history
Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4eab722..086b091 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2013-02-27  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <abarth@webkit.org>
 
         Unreviewed.
diff --git a/LayoutTests/platform/mac-wk2/plugins/netscape-plugin-setwindow-size-2-expected.txt b/LayoutTests/platform/mac-wk2/plugins/netscape-plugin-setwindow-size-2-expected.txt
new file mode 100644 (file)
index 0000000..0f93a7b
--- /dev/null
+++ b/LayoutTests/platform/mac-wk2/plugins/netscape-plugin-setwindow-size-2-expected.txt
@@ -0,0 +1 @@
+This tests that a hidden plug-in gets a correct NPP_SetWindow the first time.
diff --git a/LayoutTests/plugins/netscape-plugin-setwindow-size-2.html b/LayoutTests/plugins/netscape-plugin-setwindow-size-2.html
index 180349b..140619a 100644 (file)
--- a/LayoutTests/plugins/netscape-plugin-setwindow-size-2.html
+++ b/LayoutTests/plugins/netscape-plugin-setwindow-size-2.html
@@ -3,7 +3,6 @@
 <script>
     if (window.testRunner) {
         testRunner.dumpAsText();
-        testRunner.waitUntilDone();
         testRunner.setWindowIsKey(false);
     }
     
diff --git a/LayoutTests/plugins/netscape-plugin-setwindow-size.html b/LayoutTests/plugins/netscape-plugin-setwindow-size.html
index 62bccbf..9d40205 100644 (file)
--- a/LayoutTests/plugins/netscape-plugin-setwindow-size.html
+++ b/LayoutTests/plugins/netscape-plugin-setwindow-size.html
@@ -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>
diff --git a/LayoutTests/plugins/pass-different-npp-struct.html b/LayoutTests/plugins/pass-different-npp-struct.html
index 1b8e55b..1b8de35 100644 (file)
--- a/LayoutTests/plugins/pass-different-npp-struct.html
+++ b/LayoutTests/plugins/pass-different-npp-struct.html
@@ -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>
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 703e02d..27985d9 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2013-02-27  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <abarth@webkit.org>
 
         [Chromium] Enable threaded HTML parser by default in DumpRenderTree
diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp b/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp
index d78a29b..c9af49c 100644 (file)
--- a/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp
+++ b/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp
@@ -58,11 +58,9 @@ private:
 
         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;
     }
 
diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp b/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp
index 256acc0..97a4cf3 100644 (file)
--- a/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp
+++ b/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp
@@ -351,7 +351,6 @@ NPError NPP_SetWindow(NPP instance, NPWindow *window)
         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)
Mirror of the WebKit open source project from svn.webkit.org.