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

Unified Diff: third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

Issue 2865923002: Move LocaleForLineBreakIterator() to ComputedStyle (Closed)
Patch Set: Revert ng changes Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
diff --git a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
index 59641fc65b72aaa0451ba818809b7d3bc58a9f6c..84f7cacb361b2dc777c53cc58ed4b39c8847e40c 100644
--- a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
+++ b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
@@ -744,7 +744,7 @@ ALWAYS_INLINE int LastBreakablePositionForBreakAll(LineLayoutText text,
int start,
int end) {
LazyLineBreakIterator line_break_iterator(text.GetText(),
- LocaleForLineBreakIterator(style));
+ style.LocaleForLineBreakIterator());
int last_breakable_position = 0, next_breakable_position = -1;
for (int i = start;; i = next_breakable_position + 1) {
line_break_iterator.IsBreakable(i, next_breakable_position,
@@ -804,7 +804,7 @@ ALWAYS_INLINE bool BreakingContext::RewindToFirstMidWordBreak(
int end = CanMidWordBreakBefore(text) ? start : start + 1;
if (break_all) {
LazyLineBreakIterator line_break_iterator(
- text.GetText(), LocaleForLineBreakIterator(style));
+ text.GetText(), style.LocaleForLineBreakIterator());
int next_breakable = -1;
line_break_iterator.IsBreakable(end, next_breakable,
LineBreakType::kBreakAll);
@@ -996,7 +996,7 @@ inline bool BreakingContext::HandleText(WordMeasurements& word_measurements,
layout_text_info_.text_ = layout_text;
layout_text_info_.font_ = &font;
layout_text_info_.line_break_iterator_.ResetStringAndReleaseIterator(
- layout_text.GetText(), LocaleForLineBreakIterator(style));
+ layout_text.GetText(), style.LocaleForLineBreakIterator());
} else if (layout_text_info_.font_ != &font) {
layout_text_info_.font_ = &font;
}
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutText.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698