third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h - Issue 2877333002: Make EWordBreak an enum class.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2877333002: Make EWordBreak an enum class. (Closed)

Patch Set: Release 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

« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutText.cpp ('k') | third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 ad5951fa8e56ae8ee3a3f2575ad01ecfd8bd2c18..dafcf2bef63e37f8a60a48156c2fda4219fd4fff 100644

--- a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

+++ b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

@@ -788,7 +788,7 @@ ALWAYS_INLINE bool BreakingContext::CanMidWordBreakBefore(LineLayoutText text) {

const ComputedStyle& parent_style = parent.StyleRef();

return parent_style.AutoWrap() &&

((parent_style.BreakWords() && !width_.CommittedWidth()) ||

- parent_style.WordBreak() == kBreakAllWordBreak);

+ parent_style.WordBreak() == EWordBreak::kBreakAll);

}

return false;

@@ -955,9 +955,9 @@ inline bool BreakingContext::HandleText(WordMeasurements& word_measurements,

curr_ws_ == EWhiteSpace::kPre);

bool mid_word_break = false;

bool break_all =

- current_style_->WordBreak() == kBreakAllWordBreak && auto_wrap_;

+ current_style_->WordBreak() == EWordBreak::kBreakAll && auto_wrap_;

bool keep_all =

- current_style_->WordBreak() == kKeepAllWordBreak && auto_wrap_;

+ current_style_->WordBreak() == EWordBreak::kKeepAll && auto_wrap_;

bool prohibit_break_inside = current_style_->HasTextCombine() &&

layout_text.IsCombineText() &&

LineLayoutTextCombine(layout_text).IsCombined();