[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 fbd0a6491f515fc87635c49e6aad8c793542e797
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 22 20:27:21 2010 +0000

    https://bugs.webkit.org/show_bug.cgi?id=46298, add logicalWidth/Height getters/setters to RenderBox.
    
    Reviewed by Dan Bernstein.
    
    * rendering/RenderBox.cpp:
    (WebCore::RenderBox::logicalWidth):
    (WebCore::RenderBox::logicalHeight):
    (WebCore::RenderBox::setLogicalWidth):
    (WebCore::RenderBox::setLogicalHeight):
    * rendering/RenderBox.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68077 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 76b2298..5421aec 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-22  David Hyatt  <hyatt at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=46298, add logicalWidth/Height getters/setters to RenderBox.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::logicalWidth):
+        (WebCore::RenderBox::logicalHeight):
+        (WebCore::RenderBox::setLogicalWidth):
+        (WebCore::RenderBox::setLogicalHeight):
+        * rendering/RenderBox.h:
+
 2010-09-22  Luiz Agostini  <luiz.agostini at openbossa.org>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/rendering/RenderBox.cpp b/WebCore/rendering/RenderBox.cpp
index 514d731..ca0803d 100644
--- a/WebCore/rendering/RenderBox.cpp
+++ b/WebCore/rendering/RenderBox.cpp
@@ -83,6 +83,32 @@ RenderBox::~RenderBox()
 {
 }
 
+int RenderBox::logicalWidth() const
+{
+    return style()->isVerticalBlockFlow() ? width() : height();
+}
+
+int RenderBox::logicalHeight() const
+{
+    return style()->isVerticalBlockFlow() ? height() : width();
+}
+
+void RenderBox::setLogicalWidth(int size)
+{
+    if (style()->isVerticalBlockFlow())
+        setWidth(size);
+    else
+        setHeight(size);
+}
+
+void RenderBox::setLogicalHeight(int size)
+{
+    if (style()->isVerticalBlockFlow())
+        setHeight(size);
+    else
+        setWidth(size);
+}
+
 int RenderBox::marginBefore() const
 {
     switch (style()->blockFlow()) {
diff --git a/WebCore/rendering/RenderBox.h b/WebCore/rendering/RenderBox.h
index d23db11..f1a1e00 100644
--- a/WebCore/rendering/RenderBox.h
+++ b/WebCore/rendering/RenderBox.h
@@ -44,11 +44,16 @@ public:
     int y() const { return m_frameRect.y(); }
     int width() const { return m_frameRect.width(); }
     int height() const { return m_frameRect.height(); }
-    
+
     void setX(int x) { m_frameRect.setX(x); }
     void setY(int y) { m_frameRect.setY(y); }
     void setWidth(int width) { m_frameRect.setWidth(width); }
     void setHeight(int height) { m_frameRect.setHeight(height); }
+
+    int logicalWidth() const;
+    int logicalHeight() const;
+    void setLogicalWidth(int);
+    void setLogicalHeight(int);
     
     IntPoint location() const { return m_frameRect.location(); }
     IntSize locationOffset() const { return IntSize(x(), y()); }

-- 
WebKit Debian packaging