[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 881c2c84fe83d53d1a6f22c402d4c525b960f6d9
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 22 22:11:01 2010 +0000

    https://bugs.webkit.org/show_bug.cgi?id=46311, lock form controls and replaced elements to vertical block flow.
    
    Reviewed by Dan Bernstein.
    
    Patch form controls that don't use RenderReplaced by hand in html.css.  Patch all RenderReplaced elements
    with an override of setStyle that forces the new style to have a vertical block flow.  We have to do something like
    this to cover the CSS3 content: url(img) method of image replacement.
    
    * css/html.css:
    (input, textarea, keygen, select, button, isindex, meter, progress):
    * rendering/RenderReplaced.cpp:
    (WebCore::RenderReplaced::setStyle):
    * rendering/RenderReplaced.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68089 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bc09caa..1bf3720 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,22 @@
 
         Reviewed by Dan Bernstein.
 
+        https://bugs.webkit.org/show_bug.cgi?id=46311, lock form controls and replaced elements to vertical block flow.
+
+        Patch form controls that don't use RenderReplaced by hand in html.css.  Patch all RenderReplaced elements
+        with an override of setStyle that forces the new style to have a vertical block flow.  We have to do something like
+        this to cover the CSS3 content: url(img) method of image replacement.
+        
+        * css/html.css:
+        (input, textarea, keygen, select, button, isindex, meter, progress):
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::setStyle):
+        * rendering/RenderReplaced.h:
+
+2010-09-22  David Hyatt  <hyatt at apple.com>
+
+        Reviewed by Dan Bernstein.
+
         https://bugs.webkit.org/show_bug.cgi?id=46304
         
         display:inline should become display:inline-block when an object's block flow does not match its parent's block flow.
diff --git a/WebCore/css/html.css b/WebCore/css/html.css
index d65acb0..05100f4 100644
--- a/WebCore/css/html.css
+++ b/WebCore/css/html.css
@@ -301,6 +301,11 @@ button {
     -webkit-appearance: button;
 }
 
+/* Form controls don't go vertical. */
+input, textarea, keygen, select, button, isindex, meter, progress {
+    -webkit-block-flow: tb !important;
+}
+
 input, textarea, keygen, select, button, isindex, datagrid {
     margin: 0__qem;
     font: -webkit-small-control;
diff --git a/WebCore/rendering/RenderReplaced.cpp b/WebCore/rendering/RenderReplaced.cpp
index b54a228..61a221a 100644
--- a/WebCore/rendering/RenderReplaced.cpp
+++ b/WebCore/rendering/RenderReplaced.cpp
@@ -57,6 +57,13 @@ RenderReplaced::~RenderReplaced()
 {
 }
 
+void RenderReplaced::setStyle(PassRefPtr<RenderStyle> newStyle)
+{
+    if (newStyle->blockFlow() != TopToBottomBlockFlow)
+        newStyle->setBlockFlow(TopToBottomBlockFlow);
+    RenderBox::setStyle(newStyle);
+}
+
 void RenderReplaced::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
 {
     RenderBox::styleDidChange(diff, oldStyle);
diff --git a/WebCore/rendering/RenderReplaced.h b/WebCore/rendering/RenderReplaced.h
index 8a0543c..0c99c89 100644
--- a/WebCore/rendering/RenderReplaced.h
+++ b/WebCore/rendering/RenderReplaced.h
@@ -32,6 +32,8 @@ public:
     RenderReplaced(Node*, const IntSize& intrinsicSize);
     virtual ~RenderReplaced();
 
+    virtual void setStyle(PassRefPtr<RenderStyle>);
+
 protected:
     virtual void layout();
 

-- 
WebKit Debian packaging