[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[ossy at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 316b023062ed69fdd1a4f56215db8c0f42714098
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Feb 7 11:42:48 2010 +0000

    Rubber-stamped by Kenneth Rohde Christiansen.
    
    [Qt] Missing fast/frames/flattening/resources/frameset-flattening-subframe-resize.html
    https://bugs.webkit.org/show_bug.cgi?id=34662
    
    Missing file added from the original bug: https://bugs.webkit.org/show_bug.cgi?id=32717
    
    * fast/frames/flattening/resources: Added.
    * fast/frames/flattening/resources/frameset-flattening-subframe-resize.html: Added.
    * platform/qt/Skipped: frameset-flattening-subframe-resize.html unskipped.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54468 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5f27239..7a6cdf6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-07  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Rubber-stamped by Kenneth Rohde Christiansen.
+
+        [Qt] Missing fast/frames/flattening/resources/frameset-flattening-subframe-resize.html
+        https://bugs.webkit.org/show_bug.cgi?id=34662
+
+        Missing file added from the original bug: https://bugs.webkit.org/show_bug.cgi?id=32717
+
+        * fast/frames/flattening/resources: Added.
+        * fast/frames/flattening/resources/frameset-flattening-subframe-resize.html: Added.
+        * platform/qt/Skipped: frameset-flattening-subframe-resize.html unskipped.
+
 2010-02-05  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/LayoutTests/fast/frames/flattening/resources/frameset-flattening-subframe-resize.html b/LayoutTests/fast/frames/flattening/resources/frameset-flattening-subframe-resize.html
new file mode 100644
index 0000000..cd3822b
--- /dev/null
+++ b/LayoutTests/fast/frames/flattening/resources/frameset-flattening-subframe-resize.html
@@ -0,0 +1,8 @@
+<style>body { background-color: green; }</style>
+<div id='box' style='position: absolute; width: 100px; height: 100px; left: 0; top: 350px; background-color: red;'></div>
+<p>
+    Test for frameset flattening. The flattening only works inside the DRT.
+</p>
+<p>
+    This frame should be 300px wide and not be scrollable (have scrollbars).
+</p>
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 7778e0d..3932870 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5077,7 +5077,3 @@ printing/pageNumerForElementById.html
 
 # Because ENABLE_DASHBOARD_SUPPORT=0 is the default option. (Apple's dashboard support in OS X)
 fast/css/dashboard-regions-attr-crash.html
-
-# Missing fast/frames/flattening/resources/frameset-flattening-subframe-resize.html
-# https://bugs.webkit.org/show_bug.cgi?id=34662
-fast/frames/flattening/frameset-flattening-subframe-resize.html

-- 
WebKit Debian packaging