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

Unified Diff: Source/core/html/shadow/TextControlInnerElements.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/html/shadow/TextControlInnerElements.h ('k') | Source/core/html/track/vtt/VTTCue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/shadow/TextControlInnerElements.cpp
diff --git a/Source/core/html/shadow/TextControlInnerElements.cpp b/Source/core/html/shadow/TextControlInnerElements.cpp
index 5d27cd50fea9d9a7e921b986a17345a82b533d36..33974f692ff3010b1d19fceb231cb50e00a38904 100644
--- a/Source/core/html/shadow/TextControlInnerElements.cpp
+++ b/Source/core/html/shadow/TextControlInnerElements.cpp
@@ -57,7 +57,7 @@ PassRefPtrWillBeRawPtr<TextControlInnerContainer> TextControlInnerContainer::cre
return element.release();
}
-RenderObject* TextControlInnerContainer::createRenderer(const RenderStyle&)
+LayoutObject* TextControlInnerContainer::createRenderer(const RenderStyle&)
{
return new RenderTextControlInnerContainer(this);
}
@@ -130,14 +130,14 @@ void TextControlInnerEditorElement::defaultEventHandler(Event* event)
HTMLDivElement::defaultEventHandler(event);
}
-RenderObject* TextControlInnerEditorElement::createRenderer(const RenderStyle&)
+LayoutObject* TextControlInnerEditorElement::createRenderer(const RenderStyle&)
{
return new RenderTextControlInnerBlock(this);
}
PassRefPtr<RenderStyle> TextControlInnerEditorElement::customStyleForRenderer()
{
- RenderObject* parentRenderer = shadowHost()->renderer();
+ LayoutObject* parentRenderer = shadowHost()->renderer();
if (!parentRenderer || !parentRenderer->isTextControl())
return originalStyleForRenderer();
RenderTextControl* textControlRenderer = toRenderTextControl(parentRenderer);
« no previous file with comments | « Source/core/html/shadow/TextControlInnerElements.h ('k') | Source/core/html/track/vtt/VTTCue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698