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

Side by Side Diff: Source/core/rendering/RenderTextControl.h

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 16 matching lines...) Expand all
27 27
28 namespace WebCore { 28 namespace WebCore {
29 29
30 class HTMLTextFormControlElement; 30 class HTMLTextFormControlElement;
31 31
32 class RenderTextControl : public RenderBlockFlow { 32 class RenderTextControl : public RenderBlockFlow {
33 public: 33 public:
34 virtual ~RenderTextControl(); 34 virtual ~RenderTextControl();
35 35
36 HTMLTextFormControlElement* textFormControlElement() const; 36 HTMLTextFormControlElement* textFormControlElement() const;
37 virtual PassRefPtr<RenderStyle> createInnerTextStyle(const RenderStyle* star tStyle) const = 0; 37 virtual PassRefPtr<RenderStyle> createInnerEditorStyle(const RenderStyle* st artStyle) const = 0;
38 38
39 protected: 39 protected:
40 RenderTextControl(HTMLTextFormControlElement*); 40 RenderTextControl(HTMLTextFormControlElement*);
41 41
42 // This convenience function should not be made public because innerTextElem ent may outlive the render tree. 42 // This convenience function should not be made public because
43 HTMLElement* innerTextElement() const; 43 // innerEditorElement may outlive the render tree.
44 HTMLElement* innerEditorElement() const;
44 45
45 int scrollbarThickness() const; 46 int scrollbarThickness() const;
46 void adjustInnerTextStyle(RenderStyle* textBlockStyle) const; 47 void adjustInnerEditorStyle(RenderStyle* textBlockStyle) const;
47 48
48 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE; 49 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE;
49 50
50 void hitInnerTextElement(HitTestResult&, const LayoutPoint& pointInContainer , const LayoutPoint& accumulatedOffset); 51 void hitInnerEditorElement(HitTestResult&, const LayoutPoint& pointInContain er, const LayoutPoint& accumulatedOffset);
51 52
52 int textBlockLogicalWidth() const; 53 int textBlockLogicalWidth() const;
53 int textBlockLogicalHeight() const; 54 int textBlockLogicalHeight() const;
54 55
55 float scaleEmToUnits(int x) const; 56 float scaleEmToUnits(int x) const;
56 57
57 static bool hasValidAvgCharWidth(AtomicString family); 58 static bool hasValidAvgCharWidth(AtomicString family);
58 virtual float getAvgCharWidth(AtomicString family); 59 virtual float getAvgCharWidth(AtomicString family);
59 virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const = 0; 60 virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const = 0;
60 virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, Layout Unit nonContentHeight) const = 0; 61 virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, Layout Unit nonContentHeight) const = 0;
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 return RenderBlock::baselinePosition(baseline, firstLine, direction, pos ition); 103 return RenderBlock::baselinePosition(baseline, firstLine, direction, pos ition);
103 } 104 }
104 virtual int firstLineBoxBaseline() const OVERRIDE { return RenderBlock::firs tLineBoxBaseline(); } 105 virtual int firstLineBoxBaseline() const OVERRIDE { return RenderBlock::firs tLineBoxBaseline(); }
105 virtual int inlineBlockBaseline(LineDirectionMode direction) const OVERRIDE { return lastLineBoxBaseline(direction); } 106 virtual int inlineBlockBaseline(LineDirectionMode direction) const OVERRIDE { return lastLineBoxBaseline(direction); }
106 }; 107 };
107 108
108 109
109 } // namespace WebCore 110 } // namespace WebCore
110 111
111 #endif // RenderTextControl_h 112 #endif // RenderTextControl_h
OLDNEW
« no previous file with comments | « Source/core/html/shadow/TextControlInnerElements.cpp ('k') | Source/core/rendering/RenderTextControl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698