third_party/WebKit/Source/core/layout/LayoutTextControl.cpp - Issue 1766723004: style: Remame values in EOverflow and EVerticalAlign to CamelCase

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/LayoutTextControl.cpp

Issue 1766723004: style: Remame values in EOverflow and EVerticalAlign to CamelCase (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: enum-clash-EOverflowEVerticalAlign: rebase Created 4 years, 9 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/LayoutTableCell.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutTextControl.cpp

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

index e4e3bcf8b518d701d9a2cbfe1c088871cfd2b7d5..9fb9c4ecdc218e6c474a8eb4aa8b90e0bddc6f2d 100644

--- a/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp

@@ -123,8 +123,8 @@ void LayoutTextControl::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUni

logicalHeight = computeControlLogicalHeight(innerEditorBox->lineHeight(true, HorizontalLine, PositionOfInteriorLineBoxes), nonContentHeight);

// We are able to have a horizontal scrollbar if the overflow style is scroll, or if its auto and there's no word wrap.

- if ((isHorizontalWritingMode() && (style()->overflowX() == OSCROLL || (style()->overflowX() == OAUTO && innerEditor->layoutObject()->style()->overflowWrap() == NormalOverflowWrap)))

- || (!isHorizontalWritingMode() && (style()->overflowY() == OSCROLL || (style()->overflowY() == OAUTO && innerEditor->layoutObject()->style()->overflowWrap() == NormalOverflowWrap))))

+ if ((isHorizontalWritingMode() && (style()->overflowX() == OverflowScroll || (style()->overflowX() == OverflowAuto && innerEditor->layoutObject()->style()->overflowWrap() == NormalOverflowWrap)))

+ || (!isHorizontalWritingMode() && (style()->overflowY() == OverflowScroll || (style()->overflowY() == OverflowAuto && innerEditor->layoutObject()->style()->overflowWrap() == NormalOverflowWrap))))

logicalHeight += scrollbarThickness();

// FIXME: The logical height of the inner text box should have been added before calling computeLogicalHeight to