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

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

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch Created 6 years, 2 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
« no previous file with comments | « Source/core/rendering/RenderRubyText.h ('k') | Source/core/rendering/RenderScrollbarPart.h » ('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) 2008, 2009 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008, 2009 Apple Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 20 matching lines...) Expand all
31 #include "wtf/HashMap.h" 31 #include "wtf/HashMap.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 class LocalFrame; 35 class LocalFrame;
36 class Node; 36 class Node;
37 class RenderBox; 37 class RenderBox;
38 class RenderScrollbarPart; 38 class RenderScrollbarPart;
39 class RenderStyle; 39 class RenderStyle;
40 40
41 class RenderScrollbar FINAL : public Scrollbar { 41 class RenderScrollbar final : public Scrollbar {
42 protected: 42 protected:
43 RenderScrollbar(ScrollableArea*, ScrollbarOrientation, Node*, LocalFrame*); 43 RenderScrollbar(ScrollableArea*, ScrollbarOrientation, Node*, LocalFrame*);
44 44
45 public: 45 public:
46 friend class Scrollbar; 46 friend class Scrollbar;
47 static PassRefPtr<Scrollbar> createCustomScrollbar(ScrollableArea*, Scrollba rOrientation, Node*, LocalFrame* owningFrame = 0); 47 static PassRefPtr<Scrollbar> createCustomScrollbar(ScrollableArea*, Scrollba rOrientation, Node*, LocalFrame* owningFrame = 0);
48 virtual ~RenderScrollbar(); 48 virtual ~RenderScrollbar();
49 49
50 RenderBox* owningRenderer() const; 50 RenderBox* owningRenderer() const;
51 51
52 IntRect buttonRect(ScrollbarPart); 52 IntRect buttonRect(ScrollbarPart);
53 IntRect trackRect(int startLength, int endLength); 53 IntRect trackRect(int startLength, int endLength);
54 IntRect trackPieceRectWithMargins(ScrollbarPart, const IntRect&); 54 IntRect trackPieceRectWithMargins(ScrollbarPart, const IntRect&);
55 55
56 int minimumThumbLength(); 56 int minimumThumbLength();
57 57
58 virtual bool isOverlayScrollbar() const OVERRIDE { return false; } 58 virtual bool isOverlayScrollbar() const override { return false; }
59 59
60 RenderScrollbarPart* getPart(ScrollbarPart partType) { return m_parts.get(pa rtType); } 60 RenderScrollbarPart* getPart(ScrollbarPart partType) { return m_parts.get(pa rtType); }
61 61
62 private: 62 private:
63 virtual void setParent(Widget*) OVERRIDE; 63 virtual void setParent(Widget*) override;
64 virtual void setEnabled(bool) OVERRIDE; 64 virtual void setEnabled(bool) override;
65 65
66 virtual void setHoveredPart(ScrollbarPart) OVERRIDE; 66 virtual void setHoveredPart(ScrollbarPart) override;
67 virtual void setPressedPart(ScrollbarPart) OVERRIDE; 67 virtual void setPressedPart(ScrollbarPart) override;
68 68
69 virtual void styleChanged() OVERRIDE; 69 virtual void styleChanged() override;
70 70
71 virtual bool isCustomScrollbar() const OVERRIDE { return true; } 71 virtual bool isCustomScrollbar() const override { return true; }
72 72
73 void updateScrollbarParts(bool destroy = false); 73 void updateScrollbarParts(bool destroy = false);
74 74
75 PassRefPtr<RenderStyle> getScrollbarPseudoStyle(ScrollbarPart, PseudoId); 75 PassRefPtr<RenderStyle> getScrollbarPseudoStyle(ScrollbarPart, PseudoId);
76 void updateScrollbarPart(ScrollbarPart, bool destroy = false); 76 void updateScrollbarPart(ScrollbarPart, bool destroy = false);
77 77
78 // This Scrollbar(Widget) may outlive the DOM which created it (during tear down), 78 // This Scrollbar(Widget) may outlive the DOM which created it (during tear down),
79 // so we keep a reference to the Node which caused this custom scrollbar cre ation. 79 // so we keep a reference to the Node which caused this custom scrollbar cre ation.
80 // This will not create a reference cycle as the Widget tree is owned by our containing 80 // This will not create a reference cycle as the Widget tree is owned by our containing
81 // FrameView which this Node pointer can in no way keep alive. See webkit bu g 80610. 81 // FrameView which this Node pointer can in no way keep alive. See webkit bu g 80610.
82 RefPtrWillBePersistent<Node> m_owner; 82 RefPtrWillBePersistent<Node> m_owner;
83 83
84 LocalFrame* m_owningFrame; 84 LocalFrame* m_owningFrame;
85 WillBePersistentHeapHashMap<unsigned, RawPtrWillBeMember<RenderScrollbarPart > > m_parts; 85 WillBePersistentHeapHashMap<unsigned, RawPtrWillBeMember<RenderScrollbarPart > > m_parts;
86 }; 86 };
87 87
88 DEFINE_TYPE_CASTS(RenderScrollbar, ScrollbarThemeClient, scrollbar, scrollbar->i sCustomScrollbar(), scrollbar.isCustomScrollbar()); 88 DEFINE_TYPE_CASTS(RenderScrollbar, ScrollbarThemeClient, scrollbar, scrollbar->i sCustomScrollbar(), scrollbar.isCustomScrollbar());
89 89
90 } // namespace blink 90 } // namespace blink
91 91
92 #endif // RenderScrollbar_h 92 #endif // RenderScrollbar_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderRubyText.h ('k') | Source/core/rendering/RenderScrollbarPart.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698