Source/core/rendering/RenderTextControlMultiLine.cpp - Issue 899163003: Move rendering/RenderObject to layout/LayoutObject.

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

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 5 years, 10 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 | Annotate | Revision Log

« no previous file with comments | « Source/core/rendering/RenderTextControlMultiLine.h ('k') | Source/core/rendering/RenderTextControlSingleLine.h » ('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 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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);

84 textBlockStyle->setUnique();	84 textBlockStyle->setUnique();

85	85

86 return textBlockStyle.release();	86 return textBlockStyle.release();

87 }	87 }

88	88

89 RenderObject* RenderTextControlMultiLine::layoutSpecialExcludedChild(bool relayo utChildren, SubtreeLayoutScope& layoutScope)	89 LayoutObject* RenderTextControlMultiLine::layoutSpecialExcludedChild(bool relayo utChildren, SubtreeLayoutScope& layoutScope)

90 {	90 {

91 RenderObject* placeholderRenderer = RenderTextControl::layoutSpecialExcluded Child(relayoutChildren, layoutScope);	91 LayoutObject* placeholderRenderer = RenderTextControl::layoutSpecialExcluded Child(relayoutChildren, layoutScope);

92 if (!placeholderRenderer)	92 if (!placeholderRenderer)

93 return 0;	93 return 0;

94 if (!placeholderRenderer->isBox())	94 if (!placeholderRenderer->isBox())

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