[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 02b994e33ea295f1b03aa6ce9598297cdeae17f5
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 2 22:11:43 2011 +0000

    2011-01-02  Robert Hogan  <robert at webkit.org>
    
            Unreviewed, update expected results.
    
            Update expected results for tests added in r74872
    
            Skip test on Qt as Qt Styled Widgets are no longer getting
            rendered when plugins are disabled. This is a bug.
    
            * platform/gtk/plugins/application-plugin-plugins-disabled-expected.txt: Copied from LayoutTests/plugins/application-plugin-plugins-disabled-expected.txt.
            * platform/qt/Skipped:
            * plugins/application-plugin-plugins-disabled-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74876 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 00c7a07..943374b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,18 @@
 2011-01-02  Robert Hogan  <robert at webkit.org>
 
+        Unreviewed, update expected results.
+
+        Update expected results for tests added in r74872
+
+        Skip test on Qt as Qt Styled Widgets are no longer getting
+        rendered when plugins are disabled. This is a bug.
+
+        * platform/gtk/plugins/application-plugin-plugins-disabled-expected.txt: Copied from LayoutTests/plugins/application-plugin-plugins-disabled-expected.txt.
+        * platform/qt/Skipped:
+        * plugins/application-plugin-plugins-disabled-expected.txt:
+
+2011-01-02  Robert Hogan  <robert at webkit.org>
+
         Unreviewed. 
 
         Layout tests from changeset r56661 were missed
diff --git a/LayoutTests/platform/gtk/plugins/application-plugin-plugins-disabled-expected.txt b/LayoutTests/platform/gtk/plugins/application-plugin-plugins-disabled-expected.txt
new file mode 100644
index 0000000..f6634dd
--- /dev/null
+++ b/LayoutTests/platform/gtk/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 784x34
+        RenderText {#text} at (0,15) size 69x19
+          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,34) size 784x34
+        RenderText {#text} at (0,15) size 118x19
+          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,68) size 784x104
+        RenderText {#text} at (0,85) size 124x19
+          text run at (0,85) width 124: "Third-party plugin: "
+        RenderEmbeddedObject {EMBED} at (124,0) size 100x100
+        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 202442f..40fd039 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -346,6 +346,8 @@ fast/dom/object-embed-plugin-scripting.html
 plugins/plugin-initiate-popup-window.html
 # ---- to be reviewed
 http/tests/plugins/plugin-document-has-focus.html
+# ---- Bug: Qt Style Widgets should render when plugins are disabled
+plugins/application-plugin-plugins-disabled.html
 
 # =========================================================================== #
 #       Failing execCommand tests.                                            #
diff --git a/LayoutTests/plugins/application-plugin-plugins-disabled-expected.txt b/LayoutTests/plugins/application-plugin-plugins-disabled-expected.txt
index 7070e08..9fe44f0 100644
--- a/LayoutTests/plugins/application-plugin-plugins-disabled-expected.txt
+++ b/LayoutTests/plugins/application-plugin-plugins-disabled-expected.txt
@@ -3,18 +3,18 @@ layer 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: "
+      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,35) size 784x35
-        RenderText {#text} at (0,15) size 118x20
-          text run at (0,15) width 118: "Qt Styled Widget: "
+      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,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
+      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

-- 
WebKit Debian packaging