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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /** 1 /**
2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
3 * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 * 19 *
20 */ 20 */
21 21
22 #include "config.h" 22 #include "config.h"
23 #include "core/rendering/RenderTextControlMultiLine.h" 23 #include "core/layout/LayoutTextControlMultiLine.h"
24 24
25 #include "core/html/HTMLTextAreaElement.h" 25 #include "core/html/HTMLTextAreaElement.h"
26 #include "core/layout/HitTestResult.h" 26 #include "core/layout/HitTestResult.h"
27 27
28 namespace blink { 28 namespace blink {
29 29
30 RenderTextControlMultiLine::RenderTextControlMultiLine(HTMLTextAreaElement* elem ent) 30 LayoutTextControlMultiLine::LayoutTextControlMultiLine(HTMLTextAreaElement* elem ent)
31 : RenderTextControl(element) 31 : LayoutTextControl(element)
32 { 32 {
33 ASSERT(element); 33 ASSERT(element);
34 } 34 }
35 35
36 RenderTextControlMultiLine::~RenderTextControlMultiLine() 36 LayoutTextControlMultiLine::~LayoutTextControlMultiLine()
37 { 37 {
38 } 38 }
39 39
40 bool RenderTextControlMultiLine::nodeAtPoint(const HitTestRequest& request, HitT estResult& result, const HitTestLocation& locationInContainer, const LayoutPoint & accumulatedOffset, HitTestAction hitTestAction) 40 bool LayoutTextControlMultiLine::nodeAtPoint(const HitTestRequest& request, HitT estResult& result, const HitTestLocation& locationInContainer, const LayoutPoint & accumulatedOffset, HitTestAction hitTestAction)
41 { 41 {
42 if (!RenderTextControl::nodeAtPoint(request, result, locationInContainer, ac cumulatedOffset, hitTestAction)) 42 if (!LayoutTextControl::nodeAtPoint(request, result, locationInContainer, ac cumulatedOffset, hitTestAction))
43 return false; 43 return false;
44 44
45 if (result.innerNode() == node() || result.innerNode() == innerEditorElement ()) 45 if (result.innerNode() == node() || result.innerNode() == innerEditorElement ())
46 hitInnerEditorElement(result, locationInContainer.point(), accumulatedOf fset); 46 hitInnerEditorElement(result, locationInContainer.point(), accumulatedOf fset);
47 47
48 return true; 48 return true;
49 } 49 }
50 50
51 float RenderTextControlMultiLine::getAvgCharWidth(AtomicString family) 51 float LayoutTextControlMultiLine::getAvgCharWidth(AtomicString family)
52 { 52 {
53 // Since Lucida Grande is the default font, we want this to match the width 53 // Since Lucida Grande is the default font, we want this to match the width
54 // of Courier New, the default font for textareas in IE, Firefox and Safari Win. 54 // of Courier New, the default font for textareas in IE, Firefox and Safari Win.
55 // 1229 is the avgCharWidth value in the OS/2 table for Courier New. 55 // 1229 is the avgCharWidth value in the OS/2 table for Courier New.
56 if (family == "Lucida Grande") 56 if (family == "Lucida Grande")
57 return scaleEmToUnits(1229); 57 return scaleEmToUnits(1229);
58 58
59 return RenderTextControl::getAvgCharWidth(family); 59 return LayoutTextControl::getAvgCharWidth(family);
60 } 60 }
61 61
62 LayoutUnit RenderTextControlMultiLine::preferredContentLogicalWidth(float charWi dth) const 62 LayoutUnit LayoutTextControlMultiLine::preferredContentLogicalWidth(float charWi dth) const
63 { 63 {
64 int factor = toHTMLTextAreaElement(node())->cols(); 64 int factor = toHTMLTextAreaElement(node())->cols();
65 return static_cast<LayoutUnit>(ceilf(charWidth * factor)) + scrollbarThickne ss(); 65 return static_cast<LayoutUnit>(ceilf(charWidth * factor)) + scrollbarThickne ss();
66 } 66 }
67 67
68 LayoutUnit RenderTextControlMultiLine::computeControlLogicalHeight(LayoutUnit li neHeight, LayoutUnit nonContentHeight) const 68 LayoutUnit LayoutTextControlMultiLine::computeControlLogicalHeight(LayoutUnit li neHeight, LayoutUnit nonContentHeight) const
69 { 69 {
70 return lineHeight * toHTMLTextAreaElement(node())->rows() + nonContentHeight ; 70 return lineHeight * toHTMLTextAreaElement(node())->rows() + nonContentHeight ;
71 } 71 }
72 72
73 int RenderTextControlMultiLine::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) cons t 73 int LayoutTextControlMultiLine::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) cons t
74 { 74 {
75 return RenderBox::baselinePosition(baselineType, firstLine, direction, lineP ositionMode); 75 return RenderBox::baselinePosition(baselineType, firstLine, direction, lineP ositionMode);
76 } 76 }
77 77
78 PassRefPtr<LayoutStyle> RenderTextControlMultiLine::createInnerEditorStyle(const LayoutStyle& startStyle) const 78 PassRefPtr<LayoutStyle> LayoutTextControlMultiLine::createInnerEditorStyle(const LayoutStyle& startStyle) const
79 { 79 {
80 RefPtr<LayoutStyle> textBlockStyle = LayoutStyle::create(); 80 RefPtr<LayoutStyle> textBlockStyle = LayoutStyle::create();
81 textBlockStyle->inheritFrom(startStyle); 81 textBlockStyle->inheritFrom(startStyle);
82 adjustInnerEditorStyle(*textBlockStyle); 82 adjustInnerEditorStyle(*textBlockStyle);
83 textBlockStyle->setDisplay(BLOCK); 83 textBlockStyle->setDisplay(BLOCK);
84 textBlockStyle->setUnique(); 84 textBlockStyle->setUnique();
85 85
86 return textBlockStyle.release(); 86 return textBlockStyle.release();
87 } 87 }
88 88
89 LayoutObject* RenderTextControlMultiLine::layoutSpecialExcludedChild(bool relayo utChildren, SubtreeLayoutScope& layoutScope) 89 LayoutObject* LayoutTextControlMultiLine::layoutSpecialExcludedChild(bool relayo utChildren, SubtreeLayoutScope& layoutScope)
90 { 90 {
91 LayoutObject* placeholderRenderer = RenderTextControl::layoutSpecialExcluded Child(relayoutChildren, layoutScope); 91 LayoutObject* placeholderRenderer = LayoutTextControl::layoutSpecialExcluded Child(relayoutChildren, layoutScope);
92 if (!placeholderRenderer) 92 if (!placeholderRenderer)
93 return 0; 93 return 0;
94 if (!placeholderRenderer->isBox()) 94 if (!placeholderRenderer->isBox())
95 return placeholderRenderer; 95 return placeholderRenderer;
96 RenderBox* placeholderBox = toRenderBox(placeholderRenderer); 96 RenderBox* placeholderBox = toRenderBox(placeholderRenderer);
97 placeholderBox->style()->setLogicalWidth(Length(contentLogicalWidth() - plac eholderBox->borderAndPaddingLogicalWidth(), Fixed)); 97 placeholderBox->style()->setLogicalWidth(Length(contentLogicalWidth() - plac eholderBox->borderAndPaddingLogicalWidth(), Fixed));
98 placeholderBox->layoutIfNeeded(); 98 placeholderBox->layoutIfNeeded();
99 placeholderBox->setX(borderLeft() + paddingLeft()); 99 placeholderBox->setX(borderLeft() + paddingLeft());
100 placeholderBox->setY(borderTop() + paddingTop()); 100 placeholderBox->setY(borderTop() + paddingTop());
101 return placeholderRenderer; 101 return placeholderRenderer;
102 } 102 }
103 103
104 } 104 }
OLDNEW
« 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