Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(430)

Side by Side Diff: Source/core/rendering/RenderText.cpp

Issue 137723002: Split words on text direction boundaries when computing preffered width (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Patch for landing Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « LayoutTests/fast/text/international/inline-block-with-mixed-direction-words-expected.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * (C) 1999 Lars Knoll (knoll@kde.org) 2 * (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Dirk Mueller (mueller@kde.org) 3 * (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1002 matching lines...) Expand 10 before | Expand all | Expand 10 after
1013 break; 1013 break;
1014 c = uncheckedCharacterAt(j); 1014 c = uncheckedCharacterAt(j);
1015 if (isBreakable(breakIterator, j, nextBreakable) && characterAt(j - 1) != softHyphen) 1015 if (isBreakable(breakIterator, j, nextBreakable) && characterAt(j - 1) != softHyphen)
1016 break; 1016 break;
1017 if (breakAll) { 1017 if (breakAll) {
1018 betweenWords = false; 1018 betweenWords = false;
1019 break; 1019 break;
1020 } 1020 }
1021 } 1021 }
1022 1022
1023 // Terminate word boundary at bidi run boundary.
1024 j = min(j, run->stop());
1023 int wordLen = j - i; 1025 int wordLen = j - i;
1024 if (wordLen) { 1026 if (wordLen) {
1025 bool isSpace = (j < len) && c == ' '; 1027 bool isSpace = (j < len) && c == ' ';
1026 float w; 1028 float w;
1027 if (wordTrailingSpaceWidth && isSpace) 1029 if (wordTrailingSpaceWidth && isSpace)
1028 w = widthFromCache(f, i, wordLen + 1, leadWidth + currMaxWidth, textDirection, &fallbackFonts, &glyphOverflow) - wordTrailingSpaceWidth; 1030 w = widthFromCache(f, i, wordLen + 1, leadWidth + currMaxWidth, textDirection, &fallbackFonts, &glyphOverflow) - wordTrailingSpaceWidth;
1029 else { 1031 else {
1030 w = widthFromCache(f, i, wordLen, leadWidth + currMaxWidth, text Direction, &fallbackFonts, &glyphOverflow); 1032 w = widthFromCache(f, i, wordLen, leadWidth + currMaxWidth, text Direction, &fallbackFonts, &glyphOverflow);
1031 if (c == softHyphen) 1033 if (c == softHyphen)
1032 currMinWidth += hyphenWidth(this, f); 1034 currMinWidth += hyphenWidth(this, f);
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
1861 } 1863 }
1862 secureTextTimer->restartWithNewText(lastTypedCharacterOffset); 1864 secureTextTimer->restartWithNewText(lastTypedCharacterOffset);
1863 } 1865 }
1864 1866
1865 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox() 1867 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox()
1866 { 1868 {
1867 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox); 1869 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox);
1868 } 1870 }
1869 1871
1870 } // namespace WebCore 1872 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/text/international/inline-block-with-mixed-direction-words-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698