Changeset 192564 in webkit
- Timestamp:
- Nov 17, 2015 7:00:43 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r192545 r192564 1 2015-11-17 Zalan Bujtas <zalan@apple.com> 2 3 Simple line layout: Add letter-spacing support. 4 https://bugs.webkit.org/show_bug.cgi?id=151362 5 6 Reviewed by Antti Koivisto. 7 8 This enables us to use simple line layout on letter-spacing content. 9 (fixme: webkit.org/b/151368 -> Repaint rect is not computed correctly when negative letter-spacing applied) 10 11 * fast/text/simple-line-letterspacing-expected.html: Added. 12 * fast/text/simple-line-letterspacing.html: Added. 13 1 14 2015-11-17 Ryan Haddad <ryanhaddad@apple.com> 2 15 -
trunk/Source/WebCore/ChangeLog
r192541 r192564 1 2015-11-17 Zalan Bujtas <zalan@apple.com> 2 3 Simple line layout: Add letter-spacing support. 4 https://bugs.webkit.org/show_bug.cgi?id=151362 5 6 Reviewed by Antti Koivisto. 7 8 This enables us to use simple line layout on letter-spacing content. 9 (fixme: webkit.org/b/151368 -> Repaint rect is not computed correctly when negative letter-spacing applied) 10 11 Test: fast/text/simple-line-letterspacing.html 12 13 * rendering/SimpleLineLayout.cpp: 14 (WebCore::SimpleLineLayout::canUseForStyle): 15 * rendering/SimpleLineLayoutFunctions.cpp: 16 (WebCore::SimpleLineLayout::paintFlow): RenderLineBoxList tests vertical intersection only. 17 * rendering/SimpleLineLayoutTextFragmentIterator.cpp: 18 (WebCore::SimpleLineLayout::TextFragmentIterator::runWidth): 19 1 20 2015-11-17 Per Arne Vollan <peavo@outlook.com> 2 21 -
trunk/Source/WebCore/rendering/SimpleLineLayout.cpp
r192526 r192564 123 123 if (!style.textIndent().isZero()) 124 124 return false; 125 if (!style.wordSpacing().isZero() || style.letterSpacing())125 if (!style.wordSpacing().isZero()) 126 126 return false; 127 127 if (!style.isLeftToRightDirection()) -
trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp
r192140 r192564 87 87 float deviceScaleFactor = flow.document().deviceScaleFactor(); 88 88 for (const auto& run : resolver.rangeForRect(paintRect)) { 89 if (run.start() == run.end()) 90 continue; 91 89 92 FloatRect rect = run.rect(); 90 93 rect.inflate(strokeOverflow); 91 if ( !rect.intersects(paintRect) || run.start() == run.end())94 if (paintRect.y() > rect.maxY() || paintRect.maxY() < rect.y()) 92 95 continue; 96 93 97 TextRun textRun(run.text()); 94 98 textRun.setTabSize(!style.collapseWhiteSpace(), style.tabSize()); -
trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp
r189870 r192564 209 209 if (measureWithEndSpace) 210 210 width -= m_style.spaceWidth; 211 return width;212 } 213 214 } 215 } 211 return std::max<float>(0, width); 212 } 213 214 } 215 }
Note: See TracChangeset
for help on using the changeset viewer.