[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 15b0f2f5bacb95eeacae041b03b3062631de1225
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 20:41:19 2010 +0000

    https://bugs.webkit.org/show_bug.cgi?id=46400
    
    Reviewed by Adele Peterson.
    
    Add logicalLeft/Top getter/setters to line boxes.
    
    * rendering/InlineBox.h:
    (WebCore::InlineBox::logicalLeft):
    (WebCore::InlineBox::setLogicalLeft):
    (WebCore::InlineBox::logicalTop):
    (WebCore::InlineBox::setLogicalTop):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68189 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1e3af13..7ce55d9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-23  David Hyatt  <hyatt at apple.com>
+
+        Reviewed by Adele Peterson.
+
+        https://bugs.webkit.org/show_bug.cgi?id=46400
+        
+        Add logicalLeft/Top getter/setters to line boxes.
+
+        * rendering/InlineBox.h:
+        (WebCore::InlineBox::logicalLeft):
+        (WebCore::InlineBox::setLogicalLeft):
+        (WebCore::InlineBox::logicalTop):
+        (WebCore::InlineBox::setLogicalTop):
+
 2010-09-23  Matthew Delaney  <mdelaney at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/rendering/InlineBox.h b/WebCore/rendering/InlineBox.h
index cbddef8..2281b75 100644
--- a/WebCore/rendering/InlineBox.h
+++ b/WebCore/rendering/InlineBox.h
@@ -206,14 +206,34 @@ public:
     const RootInlineBox* root() const;
     RootInlineBox* root();
 
-    // x() is the left side of the box in the parent's coordinate system.
+    // x() is the left side of the box in the containing block's coordinate system.
     void setX(int x) { m_x = x; }
     int x() const { return m_x; }
 
-    // y() is the top of the box in the parent's coordinate system.
+    // y() is the top side of the box in the containing block's coordinate system.
     void setY(int y) { m_y = y; }
     int y() const { return m_y; }
 
+    // The logicalLeft position is the left edge of the line box in a horizontal line and the top edge in a vertical line.
+    int logicalLeft() const { return !m_isVertical ? m_x : m_y; }
+    void setLogicalLeft(int left)
+    {
+        if (!m_isVertical)
+            m_x = left;
+        else
+            m_y = left;
+    }
+
+    // The logicalTop[ position is the top edge of the line box in a horizontal line and the left edge in a vertical line.
+    int logicalTop() const { return !m_isVertical ? m_y : m_x; }
+    void setLogicalTop(int top)
+    {
+        if (!m_isVertical)
+            m_y = top;
+        else
+            m_x = top;
+    }
+
     // The logical width is our extent in the line's overall inline direction, i.e., width for horizontal text and height for vertical text.
     void setLogicalWidth(int w) { m_logicalWidth = w; }
     int logicalWidth() const { return m_logicalWidth; }

-- 
WebKit Debian packaging