Diff
Modified: trunk/LayoutTests/ChangeLog (111350 => 111351)
--- trunk/LayoutTests/ChangeLog 2012-03-20 04:47:25 UTC (rev 111350)
+++ trunk/LayoutTests/ChangeLog 2012-03-20 04:48:53 UTC (rev 111351)
@@ -1,3 +1,25 @@
+2012-03-19 Anders Carlsson <[email protected]>
+
+ plugins/application-plugin-plugins-disabled.html should be a Qt specific test
+ https://bugs.webkit.org/show_bug.cgi?id=81628
+
+ Reviewed by Jessie Berlin.
+
+ This test tests an "application specific plug-in" feature that only Qt has so this should be
+ a Qt specific test.
+
+ * platform/chromium-linux/plugins/application-plugin-plugins-disabled-expected.png: Removed.
+ * platform/chromium-mac-leopard/plugins/application-plugin-plugins-disabled-expected.png: Removed.
+ * platform/chromium-mac-snowleopard/plugins/application-plugin-plugins-disabled-expected.png: Removed.
+ * platform/chromium-mac/plugins/application-plugin-plugins-disabled-expected.png: Removed.
+ * platform/chromium-win/plugins/application-plugin-plugins-disabled-expected.png: Removed.
+ * platform/chromium-win/plugins/application-plugin-plugins-disabled-expected.txt: Removed.
+ * platform/gtk/plugins/application-plugin-plugins-disabled-expected.txt: Removed.
+ * platform/mac-snowleopard/plugins/application-plugin-plugins-disabled-expected.png: Removed.
+ * platform/mac/plugins/application-plugin-plugins-disabled-expected.txt: Removed.
+ * platform/qt/plugins/application-plugin-plugins-disabled.html: Renamed from LayoutTests/plugins/application-plugin-plugins-disabled.html.
+ * platform/wk2/Skipped:
+
2012-03-19 Keishi Hattori <[email protected]>
[chromium] Rebaseline caused by r111334
Deleted: trunk/LayoutTests/platform/chromium-linux/plugins/application-plugin-plugins-disabled-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-mac/plugins/application-plugin-plugins-disabled-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-mac-leopard/plugins/application-plugin-plugins-disabled-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-mac-snowleopard/plugins/application-plugin-plugins-disabled-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/plugins/application-plugin-plugins-disabled-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/plugins/application-plugin-plugins-disabled-expected.txt (111350 => 111351)
--- trunk/LayoutTests/platform/chromium-win/plugins/application-plugin-plugins-disabled-expected.txt 2012-03-20 04:47:25 UTC (rev 111350)
+++ trunk/LayoutTests/platform/chromium-win/plugins/application-plugin-plugins-disabled-expected.txt 2012-03-20 04:48:53 UTC (rev 111351)
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 784x35
- RenderText {#text} at (0,15) size 63x19
- text run at (0,15) width 63: "Qt Plugin: "
- RenderEmbeddedObject {OBJECT} at (63,0) size 300x30
- RenderText {#text} at (0,0) size 0x0
- RenderBlock {DIV} at (0,35) size 784x35
- RenderText {#text} at (0,15) size 113x19
- text run at (0,15) width 113: "Qt Styled Widget: "
- RenderEmbeddedObject {OBJECT} at (113,0) size 300x30
- RenderText {#text} at (0,0) size 0x0
- RenderBlock {DIV} at (0,70) size 784x105
- RenderText {#text} at (0,85) size 115x19
- text run at (0,85) width 115: "Third-party plugin: "
- RenderEmbeddedObject {EMBED} at (115,0) size 100x100
- RenderText {#text} at (0,0) size 0x0
Deleted: trunk/LayoutTests/platform/gtk/plugins/application-plugin-plugins-disabled-expected.txt (111350 => 111351)
--- trunk/LayoutTests/platform/gtk/plugins/application-plugin-plugins-disabled-expected.txt 2012-03-20 04:47:25 UTC (rev 111350)
+++ trunk/LayoutTests/platform/gtk/plugins/application-plugin-plugins-disabled-expected.txt 2012-03-20 04:48:53 UTC (rev 111351)
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 784x34
- RenderText {#text} at (0,16) size 71x17
- text run at (0,16) width 71: "Qt Plugin: "
- RenderEmbeddedObject {OBJECT} at (70,0) size 300x30
- RenderText {#text} at (0,0) size 0x0
- RenderBlock {DIV} at (0,34) size 784x34
- RenderText {#text} at (0,16) size 121x17
- text run at (0,16) width 121: "Qt Styled Widget: "
- RenderEmbeddedObject {OBJECT} at (120,0) size 300x30
- RenderText {#text} at (0,0) size 0x0
- RenderBlock {DIV} at (0,68) size 784x104
- RenderText {#text} at (0,86) size 128x17
- text run at (0,86) width 128: "Third-party plugin: "
- RenderEmbeddedObject {EMBED} at (127,0) size 100x100
- RenderText {#text} at (0,0) size 0x0
Deleted: trunk/LayoutTests/platform/mac/plugins/application-plugin-plugins-disabled-expected.txt (111350 => 111351)
--- trunk/LayoutTests/platform/mac/plugins/application-plugin-plugins-disabled-expected.txt 2012-03-20 04:47:25 UTC (rev 111350)
+++ trunk/LayoutTests/platform/mac/plugins/application-plugin-plugins-disabled-expected.txt 2012-03-20 04:48:53 UTC (rev 111351)
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 784x34
- RenderText {#text} at (0,16) size 69x18
- text run at (0,16) width 69: "Qt Plugin: "
- RenderEmbeddedObject {OBJECT} at (69,0) size 300x30
- RenderText {#text} at (0,0) size 0x0
- RenderBlock {DIV} at (0,34) size 784x34
- RenderText {#text} at (0,16) size 118x18
- text run at (0,16) width 118: "Qt Styled Widget: "
- RenderEmbeddedObject {OBJECT} at (118,0) size 300x30
- RenderText {#text} at (0,0) size 0x0
- RenderBlock {DIV} at (0,68) size 784x104
- RenderText {#text} at (0,86) size 124x18
- text run at (0,86) width 124: "Third-party plugin: "
- RenderEmbeddedObject {EMBED} at (124,0) size 100x100
- RenderText {#text} at (0,0) size 0x0
Deleted: trunk/LayoutTests/platform/mac-snowleopard/plugins/application-plugin-plugins-disabled-expected.png
(Binary files differ)
Copied: trunk/LayoutTests/platform/qt/plugins/application-plugin-plugins-disabled.html (from rev 111349, trunk/LayoutTests/plugins/application-plugin-plugins-disabled.html) (0 => 111351)
--- trunk/LayoutTests/platform/qt/plugins/application-plugin-plugins-disabled.html (rev 0)
+++ trunk/LayoutTests/platform/qt/plugins/application-plugin-plugins-disabled.html 2012-03-20 04:48:53 UTC (rev 111351)
@@ -0,0 +1,34 @@
+<!-- Application plugins are plugins implemented by the WebKit client, as opposed to
+ third-party plugins such as Flash. Application plugins are exempted
+ from the pluginsEnabled check as it is the client that implicitly decides
+ whether or not they enabled when it chooses whether to implement them or not.
+
+ At the time of writing, only Qt clients can implement their own plugins. -->
+<html>
+<body>
+<script>
+ if (window.layoutTestController) {
+ layoutTestController.overridePreference("WebKitPluginsEnabled", false);
+ }
+</script>
+
+<!-- qt plugin widget: will be created -->
+<div>
+Qt Plugin:
+<object type="application/x-qt-plugin" classid="" name="progressbar1" height=30></object>
+</div>
+
+<!-- qt styled widget: will be created -->
+<div>
+Qt Styled Widget:
+<object type="application/x-qt-styled-widget" classid="" name="progressbar1" height=30></object>
+</div>
+
+<!-- third party plugin widget: will not be created -->
+<div>
+Third-party plugin:
+<embed name="plg" type="application/x-webkit-test-netscape" width=100 height=100></embed>
+</div>
+
+</body>
+</html>
Modified: trunk/LayoutTests/platform/wk2/Skipped (111350 => 111351)
--- trunk/LayoutTests/platform/wk2/Skipped 2012-03-20 04:47:25 UTC (rev 111350)
+++ trunk/LayoutTests/platform/wk2/Skipped 2012-03-20 04:48:53 UTC (rev 111351)
@@ -212,7 +212,6 @@
fast/canvas/webgl/uniform-array-length-overflow.html
fast/overflow/horizontal-scroll-after-back.html
http/tests/navigation/go-back-to-error-page.html
-plugins/application-plugin-plugins-disabled.html
fast/canvas/webgl/canvas-zero-size.html
fast/canvas/webgl/context-lost-restored.html
fast/canvas/webgl/context-lost.html
Deleted: trunk/LayoutTests/plugins/application-plugin-plugins-disabled.html (111350 => 111351)
--- trunk/LayoutTests/plugins/application-plugin-plugins-disabled.html 2012-03-20 04:47:25 UTC (rev 111350)
+++ trunk/LayoutTests/plugins/application-plugin-plugins-disabled.html 2012-03-20 04:48:53 UTC (rev 111351)
@@ -1,34 +0,0 @@
-<!-- Application plugins are plugins implemented by the WebKit client, as opposed to
- third-party plugins such as Flash. Application plugins are exempted
- from the pluginsEnabled check as it is the client that implicitly decides
- whether or not they enabled when it chooses whether to implement them or not.
-
- At the time of writing, only Qt clients can implement their own plugins. -->
-<html>
-<body>
-<script>
- if (window.layoutTestController) {
- layoutTestController.overridePreference("WebKitPluginsEnabled", false);
- }
-</script>
-
-<!-- qt plugin widget: will be created -->
-<div>
-Qt Plugin:
-<object type="application/x-qt-plugin" classid="" name="progressbar1" height=30></object>
-</div>
-
-<!-- qt styled widget: will be created -->
-<div>
-Qt Styled Widget:
-<object type="application/x-qt-styled-widget" classid="" name="progressbar1" height=30></object>
-</div>
-
-<!-- third party plugin widget: will not be created -->
-<div>
-Third-party plugin:
-<embed name="plg" type="application/x-webkit-test-netscape" width=100 height=100></embed>
-</div>
-
-</body>
-</html>
