third_party/WebKit/Source/core/layout/LayoutTextControlMultiLine.cpp - Issue 2370673002: Changed EDisplay to an enum class and renamed its members to be keywords

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

Issue 2370673002: Changed EDisplay to an enum class and renamed its members to be keywords (Closed)

Patch Set: Comment Created 4 years, 2 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:

« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTableSection.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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. (http://www.torchmo bile.com/)	3 * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)

4 *	4 *

5 * This library is free software; you can redistribute it and/or	5 * This library is free software; you can redistribute it and/or

6 * modify it under the terms of the GNU Library General Public	6 * modify it under the terms of the GNU Library General Public

7 * License as published by the Free Software Foundation; either	7 * License as published by the Free Software Foundation; either

8 * version 2 of the License, or (at your option) any later version.	8 * version 2 of the License, or (at your option) any later version.

9 *	9 *

10 * This library is distributed in the hope that it will be useful,	10 * This library is distributed in the hope that it will be useful,

(...skipping 63 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
74 int LayoutTextControlMultiLine::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) cons t	74 int LayoutTextControlMultiLine::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) cons t

75 {	75 {

76 return LayoutBox::baselinePosition(baselineType, firstLine, direction, lineP ositionMode);	76 return LayoutBox::baselinePosition(baselineType, firstLine, direction, lineP ositionMode);

77 }	77 }

78	78

79 PassRefPtr<ComputedStyle> LayoutTextControlMultiLine::createInnerEditorStyle(con st ComputedStyle& startStyle) const	79 PassRefPtr<ComputedStyle> LayoutTextControlMultiLine::createInnerEditorStyle(con st ComputedStyle& startStyle) const

80 {	80 {

81 RefPtr<ComputedStyle> textBlockStyle = ComputedStyle::create();	81 RefPtr<ComputedStyle> textBlockStyle = ComputedStyle::create();

82 textBlockStyle->inheritFrom(startStyle);	82 textBlockStyle->inheritFrom(startStyle);

83 adjustInnerEditorStyle(*textBlockStyle);	83 adjustInnerEditorStyle(*textBlockStyle);

84 textBlockStyle->setDisplay(BLOCK);	84 textBlockStyle->setDisplay(EDisplay::Block);

85 textBlockStyle->setUnique();	85 textBlockStyle->setUnique();

86	86

87 return textBlockStyle.release();	87 return textBlockStyle.release();

88 }	88 }

89	89

90 LayoutObject* LayoutTextControlMultiLine::layoutSpecialExcludedChild(bool relayo utChildren, SubtreeLayoutScope& layoutScope)	90 LayoutObject* LayoutTextControlMultiLine::layoutSpecialExcludedChild(bool relayo utChildren, SubtreeLayoutScope& layoutScope)

91 {	91 {

92 LayoutObject* placeholderLayoutObject = LayoutTextControl::layoutSpecialExcl udedChild(relayoutChildren, layoutScope);	92 LayoutObject* placeholderLayoutObject = LayoutTextControl::layoutSpecialExcl udedChild(relayoutChildren, layoutScope);

93 if (!placeholderLayoutObject)	93 if (!placeholderLayoutObject)

94 return nullptr;	94 return nullptr;

95 if (!placeholderLayoutObject->isBox())	95 if (!placeholderLayoutObject->isBox())

96 return placeholderLayoutObject;	96 return placeholderLayoutObject;

97 LayoutBox* placeholderBox = toLayoutBox(placeholderLayoutObject);	97 LayoutBox* placeholderBox = toLayoutBox(placeholderLayoutObject);

98 placeholderBox->mutableStyleRef().setLogicalWidth(Length(contentLogicalWidth () - placeholderBox->borderAndPaddingLogicalWidth(), Fixed));	98 placeholderBox->mutableStyleRef().setLogicalWidth(Length(contentLogicalWidth () - placeholderBox->borderAndPaddingLogicalWidth(), Fixed));

99 placeholderBox->layoutIfNeeded();	99 placeholderBox->layoutIfNeeded();

100 placeholderBox->setX(borderLeft() + paddingLeft());	100 placeholderBox->setX(borderLeft() + paddingLeft());

101 placeholderBox->setY(borderTop() + paddingTop());	101 placeholderBox->setY(borderTop() + paddingTop());

102 return placeholderLayoutObject;	102 return placeholderLayoutObject;

103 }	103 }

104	104

105 } // namespace blink	105 } // namespace blink

OLD	NEW