Diff
Modified: trunk/LayoutTests/ChangeLog (145867 => 145868)
--- trunk/LayoutTests/ChangeLog 2013-03-15 02:18:45 UTC (rev 145867)
+++ trunk/LayoutTests/ChangeLog 2013-03-15 02:41:26 UTC (rev 145868)
@@ -1,3 +1,22 @@
+2013-03-14 John Bauman <jbau...@chromium.org>
+
+ plugins/plugin-clip-subframe.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=112324
+
+ Reviewed by Ryosuke Niwa.
+
+ Ignore duplicate SetWindow calls with identical arguments. Plugins
+ will ignore these so they're not a problem, and they can cause
+ flakiness on mac-wk2.
+
+ * platform/chromium-linux/plugins/plugin-clip-subframe-expected.txt:
+ * platform/chromium-mac/plugins/plugin-clip-subframe-expected.txt:
+ * platform/chromium-win/plugins/plugin-clip-subframe-expected.txt:
+ * platform/mac-wk2/plugins/plugin-clip-subframe-expected.txt:
+ * platform/mac/plugins/plugin-clip-subframe-expected.txt:
+ * plugins/plugin-clip-subframe-expected.txt:
+ * plugins/resources/plugin-clip-subframe-iframe.html:
+
2013-03-14 Chris Fleizach <cfleiz...@apple.com>
AX: Crash when removing aria-menu item from DOM
Modified: trunk/LayoutTests/platform/chromium-linux/plugins/plugin-clip-subframe-expected.txt (145867 => 145868)
--- trunk/LayoutTests/platform/chromium-linux/plugins/plugin-clip-subframe-expected.txt 2013-03-15 02:18:45 UTC (rev 145867)
+++ trunk/LayoutTests/platform/chromium-linux/plugins/plugin-clip-subframe-expected.txt 2013-03-15 02:41:26 UTC (rev 145868)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: NPP_SetWindow: non-NULL window, Rect {18, 218, 300, 150}, Clip Rect {65518, 65318, 65518, 65318}, Type 1
-CONSOLE MESSAGE: line 3: NPP_SetWindow: non-NULL window, Rect {18, 218, 300, 150}, Clip Rect {0, 0, 90, 150}, Type 1
+CONSOLE MESSAGE: line 5: NPP_SetWindow: non-NULL window, Rect {18, 218, 300, 150}, Clip Rect {65518, 65318, 65518, 65318}, Type 1
+CONSOLE MESSAGE: line 5: NPP_SetWindow: non-NULL window, Rect {18, 218, 300, 150}, Clip Rect {0, 0, 90, 150}, Type 1
Modified: trunk/LayoutTests/platform/chromium-mac/plugins/plugin-clip-subframe-expected.txt (145867 => 145868)
--- trunk/LayoutTests/platform/chromium-mac/plugins/plugin-clip-subframe-expected.txt 2013-03-15 02:18:45 UTC (rev 145867)
+++ trunk/LayoutTests/platform/chromium-mac/plugins/plugin-clip-subframe-expected.txt 2013-03-15 02:41:26 UTC (rev 145868)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: NPP_SetWindow: NULL window, Rect {0, 0, 300, 150}, Clip Rect {65518, 65318, 65518, 65318}, Type 2
-CONSOLE MESSAGE: line 3: NPP_SetWindow: NULL window, Rect {0, 0, 300, 150}, Clip Rect {0, 0, 90, 150}, Type 2
+CONSOLE MESSAGE: line 5: NPP_SetWindow: NULL window, Rect {0, 0, 300, 150}, Clip Rect {65518, 65318, 65518, 65318}, Type 2
+CONSOLE MESSAGE: line 5: NPP_SetWindow: NULL window, Rect {0, 0, 300, 150}, Clip Rect {0, 0, 90, 150}, Type 2
Modified: trunk/LayoutTests/platform/chromium-win/plugins/plugin-clip-subframe-expected.txt (145867 => 145868)
--- trunk/LayoutTests/platform/chromium-win/plugins/plugin-clip-subframe-expected.txt 2013-03-15 02:18:45 UTC (rev 145867)
+++ trunk/LayoutTests/platform/chromium-win/plugins/plugin-clip-subframe-expected.txt 2013-03-15 02:41:26 UTC (rev 145868)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: NPP_SetWindow: non-NULL window, Rect {0, 0, 300, 150}, Clip Rect {0, 0, 0, 0}, Type 1
-CONSOLE MESSAGE: line 3: NPP_SetWindow: non-NULL window, Rect {0, 0, 300, 150}, Clip Rect {0, 0, 90, 150}, Type 1
+CONSOLE MESSAGE: line 5: NPP_SetWindow: non-NULL window, Rect {0, 0, 300, 150}, Clip Rect {0, 0, 0, 0}, Type 1
+CONSOLE MESSAGE: line 5: NPP_SetWindow: non-NULL window, Rect {0, 0, 300, 150}, Clip Rect {0, 0, 90, 150}, Type 1
Modified: trunk/LayoutTests/platform/mac/plugins/plugin-clip-subframe-expected.txt (145867 => 145868)
--- trunk/LayoutTests/platform/mac/plugins/plugin-clip-subframe-expected.txt 2013-03-15 02:18:45 UTC (rev 145867)
+++ trunk/LayoutTests/platform/mac/plugins/plugin-clip-subframe-expected.txt 2013-03-15 02:41:26 UTC (rev 145868)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: NPP_SetWindow: NULL window, Rect {18, 218, 300, 150}, Clip Rect {0, 600, 0, 600}, Type 0
-CONSOLE MESSAGE: line 3: NPP_SetWindow: NULL window, Rect {18, 218, 300, 150}, Clip Rect {18, 218, 108, 368}, Type 0
+CONSOLE MESSAGE: line 5: NPP_SetWindow: NULL window, Rect {18, 218, 300, 150}, Clip Rect {0, 600, 0, 600}, Type 0
+CONSOLE MESSAGE: line 5: NPP_SetWindow: NULL window, Rect {18, 218, 300, 150}, Clip Rect {18, 218, 108, 368}, Type 0
Modified: trunk/LayoutTests/platform/mac-wk2/plugins/plugin-clip-subframe-expected.txt (145867 => 145868)
--- trunk/LayoutTests/platform/mac-wk2/plugins/plugin-clip-subframe-expected.txt 2013-03-15 02:18:45 UTC (rev 145867)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/plugin-clip-subframe-expected.txt 2013-03-15 02:41:26 UTC (rev 145868)
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: line 3: NPP_SetWindow: NULL window, Rect {0, 0, 300, 150}, Clip Rect {0, 0, 0, 0}, Type 2
-CONSOLE MESSAGE: line 3: NPP_SetWindow: NULL window, Rect {0, 0, 300, 150}, Clip Rect {0, 0, 0, 0}, Type 2
-CONSOLE MESSAGE: line 3: NPP_SetWindow: NULL window, Rect {0, 0, 300, 150}, Clip Rect {0, 0, 300, 150}, Type 2
+CONSOLE MESSAGE: line 5: NPP_SetWindow: NULL window, Rect {0, 0, 300, 150}, Clip Rect {0, 0, 0, 0}, Type 2
+CONSOLE MESSAGE: line 5: NPP_SetWindow: NULL window, Rect {0, 0, 300, 150}, Clip Rect {0, 0, 300, 150}, Type 2
Modified: trunk/LayoutTests/plugins/plugin-clip-subframe-expected.txt (145867 => 145868)
--- trunk/LayoutTests/plugins/plugin-clip-subframe-expected.txt 2013-03-15 02:18:45 UTC (rev 145867)
+++ trunk/LayoutTests/plugins/plugin-clip-subframe-expected.txt 2013-03-15 02:41:26 UTC (rev 145868)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 3: NPP_SetWindow: non-NULL window, Rect {18, 218, 300, 150}, Clip Rect {65518, 65318, 65518, 65318}, Type 1
-CONSOLE MESSAGE: line 3: NPP_SetWindow: non-NULL window, Rect {18, 218, 300, 150}, Clip Rect {0, 0, 90, 150}, Type 1
+CONSOLE MESSAGE: line 5: NPP_SetWindow: non-NULL window, Rect {18, 218, 300, 150}, Clip Rect {65518, 65318, 65518, 65318}, Type 1
+CONSOLE MESSAGE: line 5: NPP_SetWindow: non-NULL window, Rect {18, 218, 300, 150}, Clip Rect {0, 0, 90, 150}, Type 1
Modified: trunk/LayoutTests/plugins/resources/plugin-clip-subframe-iframe.html (145867 => 145868)
--- trunk/LayoutTests/plugins/resources/plugin-clip-subframe-iframe.html 2013-03-15 02:18:45 UTC (rev 145867)
+++ trunk/LayoutTests/plugins/resources/plugin-clip-subframe-iframe.html 2013-03-15 02:41:26 UTC (rev 145868)
@@ -1,7 +1,11 @@
<script>
+var lastMessage;
function windowWasSet(msg) {
- console.log(msg);
+ if (msg != lastMessage)
+ console.log(msg);
+ lastMessage = msg;
}
</script>
<embed id="testCPlugin" type="application/x-webkit-test-netscape" test="log-npp-set-window"></embed>
+<div id="output"></div>