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

Unified Diff: Source/core/layout/LayoutTextControlMultiLine.cpp

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/layout/LayoutTextControlMultiLine.h ('k') | Source/core/layout/LayoutTextControlSingleLine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutTextControlMultiLine.cpp
diff --git a/Source/core/rendering/RenderTextControlMultiLine.cpp b/Source/core/layout/LayoutTextControlMultiLine.cpp
similarity index 79%
rename from Source/core/rendering/RenderTextControlMultiLine.cpp
rename to Source/core/layout/LayoutTextControlMultiLine.cpp
index 25d03ae78b403bb77aab952ceeb0c239926f3491..58d6b0b03f017e73ba2f615ee995757358b987ad 100644
--- a/Source/core/rendering/RenderTextControlMultiLine.cpp
+++ b/Source/core/layout/LayoutTextControlMultiLine.cpp
@@ -20,26 +20,26 @@
*/
#include "config.h"
-#include "core/rendering/RenderTextControlMultiLine.h"
+#include "core/layout/LayoutTextControlMultiLine.h"
#include "core/html/HTMLTextAreaElement.h"
#include "core/layout/HitTestResult.h"
namespace blink {
-RenderTextControlMultiLine::RenderTextControlMultiLine(HTMLTextAreaElement* element)
- : RenderTextControl(element)
+LayoutTextControlMultiLine::LayoutTextControlMultiLine(HTMLTextAreaElement* element)
+ : LayoutTextControl(element)
{
ASSERT(element);
}
-RenderTextControlMultiLine::~RenderTextControlMultiLine()
+LayoutTextControlMultiLine::~LayoutTextControlMultiLine()
{
}
-bool RenderTextControlMultiLine::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction hitTestAction)
+bool LayoutTextControlMultiLine::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction hitTestAction)
{
- if (!RenderTextControl::nodeAtPoint(request, result, locationInContainer, accumulatedOffset, hitTestAction))
+ if (!LayoutTextControl::nodeAtPoint(request, result, locationInContainer, accumulatedOffset, hitTestAction))
return false;
if (result.innerNode() == node() || result.innerNode() == innerEditorElement())
@@ -48,7 +48,7 @@ bool RenderTextControlMultiLine::nodeAtPoint(const HitTestRequest& request, HitT
return true;
}
-float RenderTextControlMultiLine::getAvgCharWidth(AtomicString family)
+float LayoutTextControlMultiLine::getAvgCharWidth(AtomicString family)
{
// Since Lucida Grande is the default font, we want this to match the width
// of Courier New, the default font for textareas in IE, Firefox and Safari Win.
@@ -56,26 +56,26 @@ float RenderTextControlMultiLine::getAvgCharWidth(AtomicString family)
if (family == "Lucida Grande")
return scaleEmToUnits(1229);
- return RenderTextControl::getAvgCharWidth(family);
+ return LayoutTextControl::getAvgCharWidth(family);
}
-LayoutUnit RenderTextControlMultiLine::preferredContentLogicalWidth(float charWidth) const
+LayoutUnit LayoutTextControlMultiLine::preferredContentLogicalWidth(float charWidth) const
{
int factor = toHTMLTextAreaElement(node())->cols();
return static_cast<LayoutUnit>(ceilf(charWidth * factor)) + scrollbarThickness();
}
-LayoutUnit RenderTextControlMultiLine::computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const
+LayoutUnit LayoutTextControlMultiLine::computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const
{
return lineHeight * toHTMLTextAreaElement(node())->rows() + nonContentHeight;
}
-int RenderTextControlMultiLine::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const
+int LayoutTextControlMultiLine::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const
{
return RenderBox::baselinePosition(baselineType, firstLine, direction, linePositionMode);
}
-PassRefPtr<LayoutStyle> RenderTextControlMultiLine::createInnerEditorStyle(const LayoutStyle& startStyle) const
+PassRefPtr<LayoutStyle> LayoutTextControlMultiLine::createInnerEditorStyle(const LayoutStyle& startStyle) const
{
RefPtr<LayoutStyle> textBlockStyle = LayoutStyle::create();
textBlockStyle->inheritFrom(startStyle);
@@ -86,9 +86,9 @@ PassRefPtr<LayoutStyle> RenderTextControlMultiLine::createInnerEditorStyle(const
return textBlockStyle.release();
}
-LayoutObject* RenderTextControlMultiLine::layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope& layoutScope)
+LayoutObject* LayoutTextControlMultiLine::layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope& layoutScope)
{
- LayoutObject* placeholderRenderer = RenderTextControl::layoutSpecialExcludedChild(relayoutChildren, layoutScope);
+ LayoutObject* placeholderRenderer = LayoutTextControl::layoutSpecialExcludedChild(relayoutChildren, layoutScope);
if (!placeholderRenderer)
return 0;
if (!placeholderRenderer->isBox())
« no previous file with comments | « Source/core/layout/LayoutTextControlMultiLine.h ('k') | Source/core/layout/LayoutTextControlSingleLine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698