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

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

Issue 129173004: Update rendering classes to use OVERRIDE / FINAL when needed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 11 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 17 matching lines...) Expand all
28 28
29 namespace WebCore { 29 namespace WebCore {
30 30
31 class HTMLInputElement; 31 class HTMLInputElement;
32 32
33 class RenderTextControlSingleLine : public RenderTextControl { 33 class RenderTextControlSingleLine : public RenderTextControl {
34 public: 34 public:
35 RenderTextControlSingleLine(HTMLInputElement*); 35 RenderTextControlSingleLine(HTMLInputElement*);
36 virtual ~RenderTextControlSingleLine(); 36 virtual ~RenderTextControlSingleLine();
37 // FIXME: Move createInnerTextStyle() to TextControlInnerTextElement. 37 // FIXME: Move createInnerTextStyle() to TextControlInnerTextElement.
38 virtual PassRefPtr<RenderStyle> createInnerTextStyle(const RenderStyle* star tStyle) const; 38 virtual PassRefPtr<RenderStyle> createInnerTextStyle(const RenderStyle* star tStyle) const OVERRIDE FINAL;
39 39
40 void capsLockStateMayHaveChanged(); 40 void capsLockStateMayHaveChanged();
41 41
42 protected: 42 protected:
43 virtual void centerContainerIfNeeded(RenderBox*) const { } 43 virtual void centerContainerIfNeeded(RenderBox*) const { }
44 virtual LayoutUnit computeLogicalHeightLimit() const; 44 virtual LayoutUnit computeLogicalHeightLimit() const;
45 Element* containerElement() const; 45 Element* containerElement() const;
46 Element* editingViewPortElement() const; 46 Element* editingViewPortElement() const;
47 HTMLInputElement* inputElement() const; 47 HTMLInputElement* inputElement() const;
48 virtual void updateFromElement() OVERRIDE; 48 virtual void updateFromElement() OVERRIDE FINAL;
49 49
50 private: 50 private:
51 virtual bool hasControlClip() const; 51 virtual bool hasControlClip() const OVERRIDE FINAL;
52 virtual LayoutRect controlClipRect(const LayoutPoint&) const; 52 virtual LayoutRect controlClipRect(const LayoutPoint&) const OVERRIDE FINAL;
53 virtual bool isTextField() const { return true; } 53 virtual bool isTextField() const OVERRIDE FINAL { return true; }
54 54
55 virtual void paint(PaintInfo&, const LayoutPoint&); 55 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;
56 virtual void layout(); 56 virtual void layout() OVERRIDE;
57 57
58 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE; 58 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE FINAL;
59 59
60 virtual void autoscroll(const IntPoint&); 60 virtual void autoscroll(const IntPoint&) OVERRIDE FINAL;
61 61
62 // Subclassed to forward to our inner div. 62 // Subclassed to forward to our inner div.
63 virtual int scrollLeft() const; 63 virtual int scrollLeft() const OVERRIDE FINAL;
64 virtual int scrollTop() const; 64 virtual int scrollTop() const OVERRIDE FINAL;
65 virtual int scrollWidth() const; 65 virtual int scrollWidth() const OVERRIDE FINAL;
66 virtual int scrollHeight() const; 66 virtual int scrollHeight() const OVERRIDE FINAL;
67 virtual void setScrollLeft(int); 67 virtual void setScrollLeft(int) OVERRIDE FINAL;
68 virtual void setScrollTop(int); 68 virtual void setScrollTop(int) OVERRIDE FINAL;
69 69
70 int textBlockWidth() const; 70 int textBlockWidth() const;
71 virtual float getAvgCharWidth(AtomicString family); 71 virtual float getAvgCharWidth(AtomicString family) OVERRIDE FINAL;
72 virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const; 72 virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const OVERR IDE FINAL;
73 virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, Layout Unit nonContentHeight) const OVERRIDE; 73 virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, Layout Unit nonContentHeight) const OVERRIDE;
74 74
75 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); 75 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE FINAL;
76 76
77 bool textShouldBeTruncated() const; 77 bool textShouldBeTruncated() const;
78 78
79 HTMLElement* innerSpinButtonElement() const; 79 HTMLElement* innerSpinButtonElement() const;
80 80
81 bool m_shouldDrawCapsLockIndicator; 81 bool m_shouldDrawCapsLockIndicator;
82 LayoutUnit m_desiredInnerTextLogicalHeight; 82 LayoutUnit m_desiredInnerTextLogicalHeight;
83 }; 83 };
84 84
85 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTextControlSingleLine, isTextField()); 85 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTextControlSingleLine, isTextField());
(...skipping 11 matching lines...) Expand all
97 return orientation == HorizontalScrollbar; 97 return orientation == HorizontalScrollbar;
98 } 98 }
99 virtual bool scrollsOverflowX() const OVERRIDE { return hasOverflowClip(); } 99 virtual bool scrollsOverflowX() const OVERRIDE { return hasOverflowClip(); }
100 virtual bool scrollsOverflowY() const OVERRIDE { return false; } 100 virtual bool scrollsOverflowY() const OVERRIDE { return false; }
101 virtual bool hasLineIfEmpty() const OVERRIDE { return true; } 101 virtual bool hasLineIfEmpty() const OVERRIDE { return true; }
102 }; 102 };
103 103
104 } 104 }
105 105
106 #endif 106 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTextControlMultiLine.h ('k') | Source/core/rendering/RenderTextFragment.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698