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

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

Issue 23035007: Replace HTMLTextFormControlElement::fixPlaceholderRenderer with an override of RenderTextControl::a… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Just delete the test Created 7 years, 4 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
« no previous file with comments | « Source/core/html/TextFieldInputType.cpp ('k') | Source/core/rendering/RenderTextControl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 private: 67 private:
68 virtual const char* renderName() const { return "RenderTextControl"; } 68 virtual const char* renderName() const { return "RenderTextControl"; }
69 virtual bool isTextControl() const { return true; } 69 virtual bool isTextControl() const { return true; }
70 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE; 70 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE;
71 virtual void computePreferredLogicalWidths() OVERRIDE; 71 virtual void computePreferredLogicalWidths() OVERRIDE;
72 virtual void removeLeftoverAnonymousBlock(RenderBlock*) { } 72 virtual void removeLeftoverAnonymousBlock(RenderBlock*) { }
73 virtual bool avoidsFloats() const { return true; } 73 virtual bool avoidsFloats() const { return true; }
74 virtual bool canHaveGeneratedChildren() const OVERRIDE { return false; } 74 virtual bool canHaveGeneratedChildren() const OVERRIDE { return false; }
75 virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE; 75 virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE;
76 76
77 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE FINAL;
78
77 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& addition alOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE; 79 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& addition alOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE;
78 80
79 virtual bool canBeProgramaticallyScrolled() const { return true; } 81 virtual bool canBeProgramaticallyScrolled() const { return true; }
80 82
81 virtual bool requiresForcedStyleRecalcPropagation() const { return true; } 83 virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
82 }; 84 };
83 85
84 inline RenderTextControl* toRenderTextControl(RenderObject* object) 86 inline RenderTextControl* toRenderTextControl(RenderObject* object)
85 { 87 {
86 ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isTextControl()); 88 ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isTextControl());
(...skipping 26 matching lines...) Expand all
113 } 115 }
114 virtual int firstLineBoxBaseline() const OVERRIDE { return RenderBlock::firs tLineBoxBaseline(); } 116 virtual int firstLineBoxBaseline() const OVERRIDE { return RenderBlock::firs tLineBoxBaseline(); }
115 virtual int inlineBlockBaseline(LineDirectionMode direction) const OVERRIDE { return lastLineBoxBaseline(direction); } 117 virtual int inlineBlockBaseline(LineDirectionMode direction) const OVERRIDE { return lastLineBoxBaseline(direction); }
116 118
117 }; 119 };
118 120
119 121
120 } // namespace WebCore 122 } // namespace WebCore
121 123
122 #endif // RenderTextControl_h 124 #endif // RenderTextControl_h
OLDNEW
« no previous file with comments | « Source/core/html/TextFieldInputType.cpp ('k') | Source/core/rendering/RenderTextControl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698