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

Unified Diff: Source/core/layout/LayoutTextControlSingleLine.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
Index: Source/core/layout/LayoutTextControlSingleLine.h
diff --git a/Source/core/rendering/RenderTextControlSingleLine.h b/Source/core/layout/LayoutTextControlSingleLine.h
similarity index 87%
rename from Source/core/rendering/RenderTextControlSingleLine.h
rename to Source/core/layout/LayoutTextControlSingleLine.h
index ec304df4b23e7a756ef403c1523aee9bc8b31e79..e4cd11a575460a9c1420622bbf04c4499a57b4ea 100644
--- a/Source/core/rendering/RenderTextControlSingleLine.h
+++ b/Source/core/layout/LayoutTextControlSingleLine.h
@@ -20,20 +20,20 @@
*
*/
-#ifndef RenderTextControlSingleLine_h
-#define RenderTextControlSingleLine_h
+#ifndef LayoutTextControlSingleLine_h
+#define LayoutTextControlSingleLine_h
#include "core/html/HTMLInputElement.h"
-#include "core/rendering/RenderTextControl.h"
+#include "core/layout/LayoutTextControl.h"
namespace blink {
class HTMLInputElement;
-class RenderTextControlSingleLine : public RenderTextControl {
+class LayoutTextControlSingleLine : public LayoutTextControl {
public:
- RenderTextControlSingleLine(HTMLInputElement*);
- virtual ~RenderTextControlSingleLine();
+ LayoutTextControlSingleLine(HTMLInputElement*);
+ virtual ~LayoutTextControlSingleLine();
// FIXME: Move createInnerEditorStyle() to TextControlInnerEditorElement.
virtual PassRefPtr<LayoutStyle> createInnerEditorStyle(const LayoutStyle& startStyle) const override final;
@@ -49,7 +49,7 @@ protected:
private:
virtual bool hasControlClip() const override final;
virtual LayoutRect controlClipRect(const LayoutPoint&) const override final;
- virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectTextField || RenderTextControl::isOfType(type); }
+ virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectTextField || LayoutTextControl::isOfType(type); }
virtual void paint(const PaintInfo&, const LayoutPoint&) override;
virtual void layout() override;
@@ -81,13 +81,13 @@ private:
LayoutUnit m_desiredInnerEditorLogicalHeight;
};
-DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderTextControlSingleLine, isTextField());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutTextControlSingleLine, isTextField());
// ----------------------------
-class RenderTextControlInnerBlock : public RenderBlockFlow {
+class LayoutTextControlInnerBlock : public RenderBlockFlow {
public:
- RenderTextControlInnerBlock(Element* element) : RenderBlockFlow(element) { }
+ LayoutTextControlInnerBlock(Element* element) : RenderBlockFlow(element) { }
virtual int inlineBlockBaseline(LineDirectionMode direction) const override { return lastLineBoxBaseline(direction); }
private:
« no previous file with comments | « Source/core/layout/LayoutTextControlMultiLine.cpp ('k') | Source/core/layout/LayoutTextControlSingleLine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698