[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[robert at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f8ad83f6e9aa7f03e6d5245512092d4addad3f92
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 2 21:13:57 2011 +0000

    2011-01-02  Robert Hogan  <robert at webkit.org>
    
            Unreviewed.
    
            Layout tests from changeset r56661 were missed
    
            This test was accidentally omitted from changeset 56661.
    
            See also https://webkit.org/b/32196
    
            https://bugs.webkit.org/show_bug.cgi?id=42562
    
            * platform/qt/plugins/application-plugin-plugins-disabled-expected.txt: Added.
            * plugins/application-plugin-plugins-disabled-expected.txt: Added.
            * plugins/application-plugin-plugins-disabled.html: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74872 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 117e5fe..00c7a07 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-02  Robert Hogan  <robert at webkit.org>
+
+        Unreviewed. 
+
+        Layout tests from changeset r56661 were missed
+
+        This test was accidentally omitted from changeset 56661.
+
+        See also https://webkit.org/b/32196
+
+        https://bugs.webkit.org/show_bug.cgi?id=42562
+
+        * platform/qt/plugins/application-plugin-plugins-disabled-expected.txt: Added.
+        * plugins/application-plugin-plugins-disabled-expected.txt: Added.
+        * plugins/application-plugin-plugins-disabled.html: Added.
+
 2011-01-01  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/platform/qt/plugins/application-plugin-plugins-disabled-expected.txt b/LayoutTests/platform/qt/plugins/application-plugin-plugins-disabled-expected.txt
new file mode 100644
index 0000000..5534f2e
--- /dev/null
+++ b/LayoutTests/platform/qt/plugins/application-plugin-plugins-disabled-expected.txt
@@ -0,0 +1,20 @@
+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,14) size 74x21
+          text run at (0,14) width 74: "Qt Plugin: "
+        RenderEmbeddedObject {OBJECT} at (74,0) size 300x30 [QT: geometry: {at (82,8) size 300x30} isHidden: 0 isSelfVisible: 1 isParentVisible: 1 mask: {at (0,0) size 300x30} ] 
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,35) size 784x35
+        RenderText {#text} at (0,14) size 125x21
+          text run at (0,14) width 125: "Qt Styled Widget: "
+        RenderEmbeddedObject {OBJECT} at (125,0) size 300x30 [QT: geometry: {at (0,0) size 300x30} isHidden: 1 isSelfVisible: 1 isParentVisible: 1 mask: {at (0,0) size 0x0} ] 
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,70) size 784x105
+        RenderText {#text} at (0,84) size 138x21
+          text run at (0,84) width 138: "Third-party plugin: "
+        RenderEmbeddedObject {EMBED} at (138,0) size 100x100
+        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/plugins/application-plugin-plugins-disabled-expected.txt b/LayoutTests/plugins/application-plugin-plugins-disabled-expected.txt
new file mode 100644
index 0000000..7070e08
--- /dev/null
+++ b/LayoutTests/plugins/application-plugin-plugins-disabled-expected.txt
@@ -0,0 +1,20 @@
+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 69x20
+          text run at (0,15) width 69: "Qt Plugin: "
+        RenderEmbeddedObject {OBJECT} at (69,0) size 300x30
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,35) size 784x35
+        RenderText {#text} at (0,15) size 118x20
+          text run at (0,15) width 118: "Qt Styled Widget: "
+        RenderEmbeddedObject {OBJECT} at (118,0) size 300x30
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,70) size 784x105
+        RenderText {#text} at (0,84) size 138x21
+          text run at (0,84) width 138: "Third-party plugin: "
+        RenderEmbeddedObject {EMBED} at (138,0) size 100x100
+        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/plugins/application-plugin-plugins-disabled.html b/LayoutTests/plugins/application-plugin-plugins-disabled.html
new file mode 100644
index 0000000..46cb82c
--- /dev/null
+++ b/LayoutTests/plugins/application-plugin-plugins-disabled.html
@@ -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="QProgressBar" name="progressbar1" height=30></object>
+</div>
+
+<!-- qt styled widget: will be created -->
+<div>
+Qt Styled Widget:
+<object type="application/x-qt-styled-widget" classid="QProgressBar" 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>

-- 
WebKit Debian packaging