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

Unified Diff: Source/core/rendering/RenderTextControl.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderTextControl.h ('k') | Source/core/rendering/RenderTextControlMultiLine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderTextControl.cpp
diff --git a/Source/core/rendering/RenderTextControl.cpp b/Source/core/rendering/RenderTextControl.cpp
index 63a8c6074272a5fccef0fb8e1dbccd39fd2efa55..cfea93dc6443953d85e8d95dd3218169ecf48070 100644
--- a/Source/core/rendering/RenderTextControl.cpp
+++ b/Source/core/rendering/RenderTextControl.cpp
@@ -51,7 +51,7 @@ HTMLElement* RenderTextControl::innerEditorElement() const
return textFormControlElement()->innerEditorElement();
}
-void RenderTextControl::addChild(RenderObject* newChild, RenderObject* beforeChild)
+void RenderTextControl::addChild(LayoutObject* newChild, LayoutObject* beforeChild)
{
// FIXME: This is a terrible hack to get the caret over the placeholder text since it'll
// make us paint the placeholder first. (See https://trac.webkit.org/changeset/118733)
@@ -289,10 +289,10 @@ void RenderTextControl::addFocusRingRects(Vector<LayoutRect>& rects, const Layou
rects.append(LayoutRect(additionalOffset, size()));
}
-RenderObject* RenderTextControl::layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope& layoutScope)
+LayoutObject* RenderTextControl::layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope& layoutScope)
{
HTMLElement* placeholder = toHTMLTextFormControlElement(node())->placeholderElement();
- RenderObject* placeholderRenderer = placeholder ? placeholder->renderer() : 0;
+ LayoutObject* placeholderRenderer = placeholder ? placeholder->renderer() : 0;
if (!placeholderRenderer)
return 0;
if (relayoutChildren)
« no previous file with comments | « Source/core/rendering/RenderTextControl.h ('k') | Source/core/rendering/RenderTextControlMultiLine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698