third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp - Issue 2895883002: Make TextEmphasisPosition 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/InlineFlowBox.cpp

Issue 2895883002: Make TextEmphasisPosition an enum class. (Closed)

Patch Set: Rebase 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/css/ComputedStyleExtraFields.json5 ('k') | third_party/WebKit/Source/core/layout/line/InlineTextBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp

diff --git a/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp b/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp

index 9a67e8adef0d8a109f9d150eea10464255e82b60..056e67f37fa3234cf03760c64056f7715e2ef4b9 100644

--- a/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp

+++ b/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp

@@ -824,7 +824,7 @@ void InlineFlowBox::PlaceBoxesInBlockDirection(

curr->GetLineLayoutItem().StyleRef(IsFirstLineStyle()),

emphasis_mark_position)) {

bool emphasis_mark_is_over =

- emphasis_mark_position == kTextEmphasisPositionOver;

+ emphasis_mark_position == TextEmphasisPosition::kOver;

if (emphasis_mark_is_over != curr->GetLineLayoutItem()

.Style(IsFirstLineStyle())

->IsFlippedLinesWritingMode())

@@ -1051,7 +1051,7 @@ inline void InlineFlowBox::AddTextBoxVisualOverflow(

text_box->GetEmphasisMarkPosition(style, emphasis_mark_position)) {

float emphasis_mark_height =

style.GetFont().EmphasisMarkHeight(style.TextEmphasisMarkString());

- if ((emphasis_mark_position == kTextEmphasisPositionOver) ==

+ if ((emphasis_mark_position == TextEmphasisPosition::kOver) ==

(!style.IsFlippedLinesWritingMode()))

top_glyph_overflow = std::min(top_glyph_overflow, -emphasis_mark_height);

else

@@ -1549,7 +1549,7 @@ LayoutUnit InlineFlowBox::ComputeOverAnnotationAdjustment(

if (style.GetTextEmphasisMark() != kTextEmphasisMarkNone &&

ToInlineTextBox(curr)->GetEmphasisMarkPosition(

style, emphasis_mark_position) &&

- emphasis_mark_position == kTextEmphasisPositionOver) {

+ emphasis_mark_position == TextEmphasisPosition::kOver) {

if (!style.IsFlippedLinesWritingMode()) {

int top_of_emphasis_mark =

(curr->LogicalTop() - style.GetFont().EmphasisMarkHeight(

@@ -1617,7 +1617,7 @@ LayoutUnit InlineFlowBox::ComputeUnderAnnotationAdjustment(

const ComputedStyle& style =

curr->GetLineLayoutItem().StyleRef(IsFirstLineStyle());

if (style.GetTextEmphasisMark() != kTextEmphasisMarkNone &&

- style.GetTextEmphasisPosition() == kTextEmphasisPositionUnder) {

+ style.GetTextEmphasisPosition() == TextEmphasisPosition::kUnder) {

if (!style.IsFlippedLinesWritingMode()) {

LayoutUnit bottom_of_emphasis_mark =

curr->LogicalBottom() + style.GetFont().EmphasisMarkHeight(