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

Unified Diff: Source/core/rendering/RenderTextControlSingleLine.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/RenderTextControlSingleLine.h ('k') | Source/core/rendering/RenderTextFragment.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderTextControlSingleLine.cpp
diff --git a/Source/core/rendering/RenderTextControlSingleLine.cpp b/Source/core/rendering/RenderTextControlSingleLine.cpp
index 01122704848853a24ea600fa3bf08eea77a1f617..c4089a049d3d31ab8eda6469ee97053158b6695b 100644
--- a/Source/core/rendering/RenderTextControlSingleLine.cpp
+++ b/Source/core/rendering/RenderTextControlSingleLine.cpp
@@ -224,16 +224,16 @@ void RenderTextControlSingleLine::styleDidChange(StyleDifference diff, const Ren
// We may have set the width and the height in the old style in layout().
// Reset them now to avoid getting a spurious layout hint.
Element* viewPort = editingViewPortElement();
- if (RenderObject* viewPortRenderer = viewPort ? viewPort->renderer() : 0) {
+ if (LayoutObject* viewPortRenderer = viewPort ? viewPort->renderer() : 0) {
viewPortRenderer->style()->setHeight(Length());
viewPortRenderer->style()->setWidth(Length());
}
Element* container = containerElement();
- if (RenderObject* containerRenderer = container ? container->renderer() : 0) {
+ if (LayoutObject* containerRenderer = container ? container->renderer() : 0) {
containerRenderer->style()->setHeight(Length());
containerRenderer->style()->setWidth(Length());
}
- RenderObject* innerEditorRenderer = innerEditorElement()->renderer();
+ LayoutObject* innerEditorRenderer = innerEditorElement()->renderer();
if (innerEditorRenderer && diff.needsFullLayout())
innerEditorRenderer->setNeedsLayoutAndFullPaintInvalidation();
if (HTMLElement* placeholder = inputElement()->placeholderElement())
« no previous file with comments | « Source/core/rendering/RenderTextControlSingleLine.h ('k') | Source/core/rendering/RenderTextFragment.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698