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

Unified Diff: Source/core/layout/LayoutTextControlMultiLine.cpp

Issue 926193003: Move rendering/RenderBox to layout/LayoutBox. (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/LayoutTextControl.cpp ('k') | Source/core/layout/LayoutTextControlSingleLine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutTextControlMultiLine.cpp
diff --git a/Source/core/layout/LayoutTextControlMultiLine.cpp b/Source/core/layout/LayoutTextControlMultiLine.cpp
index 58d6b0b03f017e73ba2f615ee995757358b987ad..6b4113c8f67986c7da37a311f80af7a776afa29a 100644
--- a/Source/core/layout/LayoutTextControlMultiLine.cpp
+++ b/Source/core/layout/LayoutTextControlMultiLine.cpp
@@ -72,7 +72,7 @@ LayoutUnit LayoutTextControlMultiLine::computeControlLogicalHeight(LayoutUnit li
int LayoutTextControlMultiLine::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const
{
- return RenderBox::baselinePosition(baselineType, firstLine, direction, linePositionMode);
+ return LayoutBox::baselinePosition(baselineType, firstLine, direction, linePositionMode);
}
PassRefPtr<LayoutStyle> LayoutTextControlMultiLine::createInnerEditorStyle(const LayoutStyle& startStyle) const
@@ -93,7 +93,7 @@ LayoutObject* LayoutTextControlMultiLine::layoutSpecialExcludedChild(bool relayo
return 0;
if (!placeholderRenderer->isBox())
return placeholderRenderer;
- RenderBox* placeholderBox = toRenderBox(placeholderRenderer);
+ LayoutBox* placeholderBox = toLayoutBox(placeholderRenderer);
placeholderBox->style()->setLogicalWidth(Length(contentLogicalWidth() - placeholderBox->borderAndPaddingLogicalWidth(), Fixed));
placeholderBox->layoutIfNeeded();
placeholderBox->setX(borderLeft() + paddingLeft());
« no previous file with comments | « Source/core/layout/LayoutTextControl.cpp ('k') | Source/core/layout/LayoutTextControlSingleLine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698