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

Unified Diff: Source/core/layout/LayoutTextControl.h

Issue 922423002: Move rendering/RenderTextControl* to layout/LayoutTextControl* (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.cpp ('k') | Source/core/layout/LayoutTextControl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutTextControl.h
diff --git a/Source/core/rendering/RenderTextControl.h b/Source/core/layout/LayoutTextControl.h
similarity index 89%
rename from Source/core/rendering/RenderTextControl.h
rename to Source/core/layout/LayoutTextControl.h
index d59a378326eea592c86f6cdfba5adbc898181d34..cacadfb1f093b0ea52a92d19b810d64db2924911 100644
--- a/Source/core/rendering/RenderTextControl.h
+++ b/Source/core/layout/LayoutTextControl.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef RenderTextControl_h
-#define RenderTextControl_h
+#ifndef LayoutTextControl_h
+#define LayoutTextControl_h
#include "core/rendering/RenderBlockFlow.h"
#include "core/rendering/RenderFlexibleBox.h"
@@ -29,15 +29,15 @@ namespace blink {
class HTMLTextFormControlElement;
-class RenderTextControl : public RenderBlockFlow {
+class LayoutTextControl : public RenderBlockFlow {
public:
- virtual ~RenderTextControl();
+ virtual ~LayoutTextControl();
HTMLTextFormControlElement* textFormControlElement() const;
virtual PassRefPtr<LayoutStyle> createInnerEditorStyle(const LayoutStyle& startStyle) const = 0;
protected:
- RenderTextControl(HTMLTextFormControlElement*);
+ LayoutTextControl(HTMLTextFormControlElement*);
// This convenience function should not be made public because
// innerEditorElement may outlive the render tree.
@@ -72,7 +72,7 @@ protected:
virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectTextControl || RenderBlockFlow::isOfType(type); }
private:
- virtual const char* renderName() const override { return "RenderTextControl"; }
+ virtual const char* renderName() const override { return "LayoutTextControl"; }
virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override final;
virtual void computePreferredLogicalWidths() override final;
virtual void removeLeftoverAnonymousBlock(RenderBlock*) override final { }
@@ -86,18 +86,18 @@ private:
virtual bool canBeProgramaticallyScrolled() const override final { return true; }
};
-DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderTextControl, isTextControl());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutTextControl, isTextControl());
// Renderer for our inner container, for <search> and others.
// We can't use RenderFlexibleBox directly, because flexboxes have a different
// baseline definition, and then inputs of different types wouldn't line up
// anymore.
-class RenderTextControlInnerContainer final : public RenderFlexibleBox {
+class LayoutTextControlInnerContainer final : public RenderFlexibleBox {
public:
- explicit RenderTextControlInnerContainer(Element* element)
+ explicit LayoutTextControlInnerContainer(Element* element)
: RenderFlexibleBox(element)
{ }
- virtual ~RenderTextControlInnerContainer() { }
+ virtual ~LayoutTextControlInnerContainer() { }
virtual int baselinePosition(FontBaseline baseline, bool firstLine, LineDirectionMode direction, LinePositionMode position) const override
{
@@ -110,4 +110,4 @@ public:
} // namespace blink
-#endif // RenderTextControl_h
+#endif // LayoutTextControl_h
« no previous file with comments | « Source/core/html/shadow/TextControlInnerElements.cpp ('k') | Source/core/layout/LayoutTextControl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698