Source/core/rendering/RenderTextControlMultiLine.cpp - Issue 351213002: Change RenderObject::style(bool) to accept an enum instead

Side by Side Diff: Source/core/rendering/RenderTextControlMultiLine.cpp

Issue 351213002: Change RenderObject::style(bool) to accept an enum instead (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Renamed enum to OwnOrFirstLineStyle, rebased and got rid of duplicate state on the stack in RootInl… Created 6 years, 5 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

« no previous file with comments | « Source/core/rendering/RenderTextControlMultiLine.h ('k') | Source/core/rendering/RenderTextControlSingleLine.cpp » ('j') | no next file with comments »

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 52 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
63 {	63 {

64 int factor = toHTMLTextAreaElement(node())->cols();	64 int factor = toHTMLTextAreaElement(node())->cols();

65 return static_cast<LayoutUnit>(ceilf(charWidth * factor)) + scrollbarThickne ss();	65 return static_cast<LayoutUnit>(ceilf(charWidth * factor)) + scrollbarThickne ss();

66 }	66 }

67	67

68 LayoutUnit RenderTextControlMultiLine::computeControlLogicalHeight(LayoutUnit li neHeight, LayoutUnit nonContentHeight) const	68 LayoutUnit RenderTextControlMultiLine::computeControlLogicalHeight(LayoutUnit li neHeight, LayoutUnit nonContentHeight) const

69 {	69 {

70 return lineHeight * toHTMLTextAreaElement(node())->rows() + nonContentHeight ;	70 return lineHeight * toHTMLTextAreaElement(node())->rows() + nonContentHeight ;

71 }	71 }

72	72

73 int RenderTextControlMultiLine::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) cons t	73 int RenderTextControlMultiLine::baselinePosition(FontBaseline baselineType, OwnO rFirstLineStyle firstLine, LineDirectionMode direction, LinePositionMode linePos itionMode) const

74 {	74 {

75 return RenderBox::baselinePosition(baselineType, firstLine, direction, lineP ositionMode);	75 return RenderBox::baselinePosition(baselineType, firstLine, direction, lineP ositionMode);

76 }	76 }

77	77

78 PassRefPtr<RenderStyle> RenderTextControlMultiLine::createInnerEditorStyle(const RenderStyle* startStyle) const	78 PassRefPtr<RenderStyle> RenderTextControlMultiLine::createInnerEditorStyle(const RenderStyle* startStyle) const

79 {	79 {

80 RefPtr<RenderStyle> textBlockStyle = RenderStyle::create();	80 RefPtr<RenderStyle> textBlockStyle = RenderStyle::create();

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

82 adjustInnerEditorStyle(textBlockStyle.get());	82 adjustInnerEditorStyle(textBlockStyle.get());

83 textBlockStyle->setDisplay(BLOCK);	83 textBlockStyle->setDisplay(BLOCK);

(...skipping 11 matching lines...) Expand all Loading...
95 return placeholderRenderer;	95 return placeholderRenderer;

96 RenderBox* placeholderBox = toRenderBox(placeholderRenderer);	96 RenderBox* placeholderBox = toRenderBox(placeholderRenderer);

97 placeholderBox->style()->setLogicalWidth(Length(contentLogicalWidth() - plac eholderBox->borderAndPaddingLogicalWidth(), Fixed));	97 placeholderBox->style()->setLogicalWidth(Length(contentLogicalWidth() - plac eholderBox->borderAndPaddingLogicalWidth(), Fixed));

98 placeholderBox->layoutIfNeeded();	98 placeholderBox->layoutIfNeeded();

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

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

101 return placeholderRenderer;	101 return placeholderRenderer;

102 }	102 }

103	103

104 }	104 }

OLD	NEW