Changeset 167677 in webkit
- Timestamp:
- Apr 22, 2014 1:05:29 PM (10 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r167676 r167677 1 2014-04-22 David Hyatt <hyatt@apple.com> 2 3 [New Multicolumn] Make sure columnTranslationForOffset has the same column-span-aware 4 translation that fragment collection does. 5 https://bugs.webkit.org/show_bug.cgi?id=131738 6 7 Reviewed by Anders Carlsson. 8 9 * rendering/RenderMultiColumnSet.cpp: 10 (WebCore::RenderMultiColumnSet::collectLayerFragments): 11 Remove a FIXME that is no longer needed, since the translation offset of the 12 column set did get patched. 13 14 (WebCore::RenderMultiColumnSet::columnTranslationForOffset): 15 Add the exact same fix to columnTranslationForOffset that was applied to collectLayerFragments. 16 1 17 2014-04-22 Mark Lam <mark.lam@apple.com> 2 18 -
trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp
r167597 r167677 791 791 if (!isHorizontalWritingMode()) 792 792 translationOffset = translationOffset.transposedPoint(); 793 // FIXME: The translation needs to include the multicolumn set's content offset within the 794 // multicolumn block as well. This won't be an issue until we start creating multiple multicolumn sets. 795 793 796 794 // Shift the dirty rect to be in flow thread coordinates with this translation applied. 797 795 LayoutRect translatedDirtyRect(dirtyRect); … … 841 839 } 842 840 translationOffset.setX(inlineOffset); 843 LayoutUnit blockOffset = initialBlockOffset + (isHorizontalWritingMode() ? -flowThreadPortion.y() : -flowThreadPortion.x());841 LayoutUnit blockOffset = initialBlockOffset + logicalTop() - flowThread()->logicalTop() + (isHorizontalWritingMode() ? -flowThreadPortion.y() : -flowThreadPortion.x()); 844 842 if (!progressionIsInline) { 845 843 if (!progressionReversed) … … 855 853 translationOffset = translationOffset.transposedPoint(); 856 854 857 // FIXME: The translation needs to include the multicolumn set's content offset within the858 // multicolumn block as well. This won't be an issue until we start creating multiple multicolumn sets.859 855 return translationOffset; 860 856 }
Note: See TracChangeset
for help on using the changeset viewer.