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

Side by Side Diff: Source/core/rendering/RenderTextControlMultiLine.cpp

Issue 340273003: Rename innerTextElement/Value used in <input> and <textarea> to innerEditor. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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,
(...skipping 24 matching lines...) Expand all
35 35
36 RenderTextControlMultiLine::~RenderTextControlMultiLine() 36 RenderTextControlMultiLine::~RenderTextControlMultiLine()
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 RenderTextControlMultiLine::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 (!RenderTextControl::nodeAtPoint(request, result, locationInContainer, ac cumulatedOffset, hitTestAction))
43 return false; 43 return false;
44 44
45 if (result.innerNode() == node() || result.innerNode() == innerTextElement() ) 45 if (result.innerNode() == node() || result.innerNode() == innerEditorElement ())
46 hitInnerTextElement(result, locationInContainer.point(), accumulatedOffs et); 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 RenderTextControlMultiLine::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")
(...skipping 11 matching lines...) Expand all
68 LayoutUnit RenderTextControlMultiLine::computeControlLogicalHeight(LayoutUnit li neHeight, LayoutUnit nonContentHeight) const 68 LayoutUnit RenderTextControlMultiLine::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 RenderTextControlMultiLine::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<RenderStyle> RenderTextControlMultiLine::createInnerTextStyle(const R enderStyle* startStyle) const 78 PassRefPtr<RenderStyle> RenderTextControlMultiLine::createInnerEditorStyle(const RenderStyle* startStyle) const
79 { 79 {
80 RefPtr<RenderStyle> textBlockStyle = RenderStyle::create(); 80 RefPtr<RenderStyle> textBlockStyle = RenderStyle::create();
81 textBlockStyle->inheritFrom(startStyle); 81 textBlockStyle->inheritFrom(startStyle);
82 adjustInnerTextStyle(textBlockStyle.get()); 82 adjustInnerEditorStyle(textBlockStyle.get());
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 RenderObject* RenderTextControlMultiLine::layoutSpecialExcludedChild(bool relayo utChildren, SubtreeLayoutScope& layoutScope) 89 RenderObject* RenderTextControlMultiLine::layoutSpecialExcludedChild(bool relayo utChildren, SubtreeLayoutScope& layoutScope)
90 { 90 {
91 RenderObject* placeholderRenderer = RenderTextControl::layoutSpecialExcluded Child(relayoutChildren, layoutScope); 91 RenderObject* placeholderRenderer = RenderTextControl::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/rendering/RenderTextControlMultiLine.h ('k') | Source/core/rendering/RenderTextControlSingleLine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698