Changeset 167764 in webkit

Timestamp:

Apr 24, 2014 10:02:37 AM (10 years ago)

Author:

hyatt@apple.com

Message:

[New Multicolumn] Client rects don't work with column spans.
​https://bugs.webkit.org/show_bug.cgi?id=132131

Reviewed by Dean Jackson.

Source/WebCore:

Don't factor in the offset of the multicolumn set from the top
of the multicolumn block. This was added already, and it doesn't
need to be a part of columnTranslationForOffset.

Added fast/multicol/client-rects-spanners.html

• rendering/RenderMultiColumnSet.cpp:

(WebCore::RenderMultiColumnSet::columnTranslationForOffset):

LayoutTests:

• fast/multicol/client-rects-spanners.html: Added.
• platform/mac/fast/multicol/client-rects-spanners-expected.png: Added.
• platform/mac/fast/multicol/client-rects-spanners-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/client-rects-spanners.html (added)
• LayoutTests/platform/mac/fast/multicol/client-rects-spanners-expected.png (added)
• LayoutTests/platform/mac/fast/multicol/client-rects-spanners-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderMultiColumnSet.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-24  David Hyatt  <hyatt@apple.com>
+
+        [New Multicolumn] Client rects don't work with column spans.
+        https://bugs.webkit.org/show_bug.cgi?id=132131
+
+        Reviewed by Dean Jackson.
+
+        * fast/multicol/client-rects-spanners.html: Added.
+        * platform/mac/fast/multicol/client-rects-spanners-expected.png: Added.
+        * platform/mac/fast/multicol/client-rects-spanners-expected.txt: Added.
+
 2014-04-24  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-24  David Hyatt  <hyatt@apple.com>
+
+        [New Multicolumn] Client rects don't work with column spans.
+        https://bugs.webkit.org/show_bug.cgi?id=132131
+
+        Reviewed by Dean Jackson.
+        
+        Don't factor in the offset of the multicolumn set from the top
+        of the multicolumn block. This was added already, and it doesn't
+        need to be a part of columnTranslationForOffset.
+
+        Added fast/multicol/client-rects-spanners.html
+
+        * rendering/RenderMultiColumnSet.cpp:
+        (WebCore::RenderMultiColumnSet::columnTranslationForOffset):
+
 2014-04-24  Praveen R Jadhav  <praveen.j@samsung.com>
 

trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp

@@ -833 +833 @@
     }
     translationOffset.setX(inlineOffset);
-    LayoutUnit blockOffset = initialBlockOffset + logicalTop() - flowThread()->logicalTop() + (isHorizontalWritingMode() ? -flowThreadPortion.y() : -flowThreadPortion.x());
+    LayoutUnit blockOffset = initialBlockOffset + (isHorizontalWritingMode() ? -flowThreadPortion.y() : -flowThreadPortion.x());
     if (!progressionIsInline) {
         if (!progressionReversed)