[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[hyatt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit eaee75c824afa85cb0b7574677cdadeffba36702
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 24 02:27:00 2010 +0000

    https://bugs.webkit.org/show_bug.cgi?id=46442
    
    Reviewed by Sam Weinig.
    
    Disallow the setting of block-flow to anything other than "tb" for all table-related display types
    and flexible box display types.  By disallowing block-flow on the subclasses of RenderBlock like tables
    and flexible boxes, we ensure that alterations to the RenderBlock base class won't result in misrenderings
    in tables and flexible boxes that try to specify other block flow values.
    
    * css/CSSStyleSelector.cpp:
    (WebCore::CSSStyleSelector::adjustRenderStyle):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68227 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 30d7a9a..caa68af 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-23  David Hyatt  <hyatt at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        https://bugs.webkit.org/show_bug.cgi?id=46442
+
+        Disallow the setting of block-flow to anything other than "tb" for all table-related display types
+        and flexible box display types.  By disallowing block-flow on the subclasses of RenderBlock like tables
+        and flexible boxes, we ensure that alterations to the RenderBlock base class won't result in misrenderings
+        in tables and flexible boxes that try to specify other block flow values.
+ 
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::adjustRenderStyle):
+
 2010-09-23  Kinuko Yasuda  <kinuko at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index c486522..d0a3994 100644
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -1724,7 +1724,7 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, RenderStyle* parent
         // clear how that should work.
         if (style->display() == INLINE && style->styleType() == NOPSEUDO && parentStyle && style->blockFlow() != parentStyle->blockFlow())
             style->setDisplay(INLINE_BLOCK);
-            
+        
         // After performing the display mutation, check table rows.  We do not honor position:relative on
         // table rows or cells.  This has been established in CSS2.1 (and caused a crash in containingBlock()
         // on some sites).
@@ -1732,6 +1732,16 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, RenderStyle* parent
              style->display() == TABLE_FOOTER_GROUP || style->display() == TABLE_ROW || style->display() == TABLE_CELL) &&
              style->position() == RelativePosition)
             style->setPosition(StaticPosition);
+        
+        // FIXME: Since we don't support block-flow on either tables or flexible boxes yet, disallow setting
+        // of block-flow to anything other than TopToBottomBlockFlow.
+        // https://bugs.webkit.org/show_bug.cgi?id=46417 - Tables support
+        // https://bugs.webkit.org/show_bug.cgi?id=46418 - Flexible box support.
+        if (style->blockFlow() != TopToBottomBlockFlow && (style->display() == TABLE || style->display() == INLINE_TABLE
+            || style->display() == TABLE_HEADER_GROUP || style->display() == TABLE_ROW_GROUP
+            || style->display() == TABLE_FOOTER_GROUP || style->display() == TABLE_ROW || style->display() == TABLE_CELL
+            || style->display() == BOX || style->display() == INLINE_BOX))
+            style->setBlockFlow(TopToBottomBlockFlow);
     }
 
     // Make sure our z-index value is only applied if the object is positioned.

-- 
WebKit Debian packaging