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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTextControl.cpp

Issue 2882903002: Make EOverflowWrap 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 unified diff | Download patch
OLDNEW
1 /** 1 /**
2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
3 * (C) 2008 Torch Mobile Inc. All rights reserved. 3 * (C) 2008 Torch Mobile Inc. All rights reserved.
4 * (http://www.torchmobile.com/) 4 * (http://www.torchmobile.com/)
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 logical_height = ComputeControlLogicalHeight( 125 logical_height = ComputeControlLogicalHeight(
126 inner_editor_box->LineHeight(true, kHorizontalLine, 126 inner_editor_box->LineHeight(true, kHorizontalLine,
127 kPositionOfInteriorLineBoxes), 127 kPositionOfInteriorLineBoxes),
128 non_content_height); 128 non_content_height);
129 129
130 // We are able to have a horizontal scrollbar if the overflow style is 130 // We are able to have a horizontal scrollbar if the overflow style is
131 // scroll, or if its auto and there's no word wrap. 131 // scroll, or if its auto and there's no word wrap.
132 if (Style()->OverflowInlineDirection() == EOverflow::kScroll || 132 if (Style()->OverflowInlineDirection() == EOverflow::kScroll ||
133 (Style()->OverflowInlineDirection() == EOverflow::kAuto && 133 (Style()->OverflowInlineDirection() == EOverflow::kAuto &&
134 inner_editor->GetLayoutObject()->Style()->OverflowWrap() == 134 inner_editor->GetLayoutObject()->Style()->OverflowWrap() ==
135 kNormalOverflowWrap)) 135 EOverflowWrap::kNormal))
136 logical_height += ScrollbarThickness(); 136 logical_height += ScrollbarThickness();
137 137
138 // FIXME: The logical height of the inner text box should have been added 138 // FIXME: The logical height of the inner text box should have been added
139 // before calling computeLogicalHeight to avoid this hack. 139 // before calling computeLogicalHeight to avoid this hack.
140 SetIntrinsicContentLogicalHeight(logical_height); 140 SetIntrinsicContentLogicalHeight(logical_height);
141 141
142 logical_height += BorderAndPaddingHeight(); 142 logical_height += BorderAndPaddingHeight();
143 } 143 }
144 144
145 LayoutBox::ComputeLogicalHeight(logical_height, logical_top, computed_values); 145 LayoutBox::ComputeLogicalHeight(logical_height, logical_top, computed_values);
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 LayoutUnit baseline(font_data->GetFontMetrics().Ascent(kAlphabeticBaseline)); 364 LayoutUnit baseline(font_data->GetFontMetrics().Ascent(kAlphabeticBaseline));
365 for (LayoutObject* box = inner_editor_layout_object; box && box != this; 365 for (LayoutObject* box = inner_editor_layout_object; box && box != this;
366 box = box->Parent()) { 366 box = box->Parent()) {
367 if (box->IsBox()) 367 if (box->IsBox())
368 baseline += ToLayoutBox(box)->LogicalTop(); 368 baseline += ToLayoutBox(box)->LogicalTop();
369 } 369 }
370 return baseline.ToInt(); 370 return baseline.ToInt();
371 } 371 }
372 372
373 } // namespace blink 373 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698