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

Side by Side Diff: third_party/WebKit/Source/platform/exported/WebScrollbarThemeClientImpl.cpp

Issue 1511003003: Use refs for non-null GraphicsContext, Scrollbar, etc. in scrollbar related code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ScrollbarRemove
Patch Set: yet another mac fix Created 5 years 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 13 matching lines...) Expand all
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 27
28 #include "platform/exported/WebScrollbarThemeClientImpl.h" 28 #include "platform/exported/WebScrollbarThemeClientImpl.h"
29 29
30 #include "platform/scroll/ScrollbarTheme.h" 30 #include "platform/scroll/ScrollbarTheme.h"
31 31
32 namespace blink { 32 namespace blink {
33 33
34 WebScrollbarThemeClientImpl::WebScrollbarThemeClientImpl(WebScrollbar* scrollbar ) 34 WebScrollbarThemeClientImpl::WebScrollbarThemeClientImpl(WebScrollbar& scrollbar )
35 : m_scrollbar(scrollbar) 35 : m_scrollbar(scrollbar)
36 { 36 {
37 ScrollbarTheme::theme()->registerScrollbar(this); 37 ScrollbarTheme::theme().registerScrollbar(*this);
38 } 38 }
39 39
40 WebScrollbarThemeClientImpl::~WebScrollbarThemeClientImpl() 40 WebScrollbarThemeClientImpl::~WebScrollbarThemeClientImpl()
41 { 41 {
42 ScrollbarTheme::theme()->unregisterScrollbar(this); 42 ScrollbarTheme::theme().unregisterScrollbar(*this);
43 } 43 }
44 44
45 int WebScrollbarThemeClientImpl::x() const 45 int WebScrollbarThemeClientImpl::x() const
46 { 46 {
47 return location().x(); 47 return location().x();
48 } 48 }
49 49
50 int WebScrollbarThemeClientImpl::y() const 50 int WebScrollbarThemeClientImpl::y() const
51 { 51 {
52 return location().y(); 52 return location().y();
53 } 53 }
54 54
55 int WebScrollbarThemeClientImpl::width() const 55 int WebScrollbarThemeClientImpl::width() const
56 { 56 {
57 return size().width(); 57 return size().width();
58 } 58 }
59 59
60 int WebScrollbarThemeClientImpl::height() const 60 int WebScrollbarThemeClientImpl::height() const
61 { 61 {
62 return size().height(); 62 return size().height();
63 } 63 }
64 64
65 IntSize WebScrollbarThemeClientImpl::size() const 65 IntSize WebScrollbarThemeClientImpl::size() const
66 { 66 {
67 return m_scrollbar->size(); 67 return m_scrollbar.size();
68 } 68 }
69 69
70 IntPoint WebScrollbarThemeClientImpl::location() const 70 IntPoint WebScrollbarThemeClientImpl::location() const
71 { 71 {
72 return m_scrollbar->location(); 72 return m_scrollbar.location();
73 } 73 }
74 74
75 Widget* WebScrollbarThemeClientImpl::parent() const 75 Widget* WebScrollbarThemeClientImpl::parent() const
76 { 76 {
77 // Unused by Chromium scrollbar themes. 77 // Unused by Chromium scrollbar themes.
78 ASSERT_NOT_REACHED(); 78 ASSERT_NOT_REACHED();
79 return 0; 79 return 0;
80 } 80 }
81 81
82 Widget* WebScrollbarThemeClientImpl::root() const 82 Widget* WebScrollbarThemeClientImpl::root() const
(...skipping 21 matching lines...) Expand all
104 } 104 }
105 105
106 void WebScrollbarThemeClientImpl::invalidateRect(const IntRect&) 106 void WebScrollbarThemeClientImpl::invalidateRect(const IntRect&)
107 { 107 {
108 // Unused by Chromium scrollbar themes. 108 // Unused by Chromium scrollbar themes.
109 ASSERT_NOT_REACHED(); 109 ASSERT_NOT_REACHED();
110 } 110 }
111 111
112 ScrollbarOverlayStyle WebScrollbarThemeClientImpl::scrollbarOverlayStyle() const 112 ScrollbarOverlayStyle WebScrollbarThemeClientImpl::scrollbarOverlayStyle() const
113 { 113 {
114 return static_cast<ScrollbarOverlayStyle>(m_scrollbar->scrollbarOverlayStyle ()); 114 return static_cast<ScrollbarOverlayStyle>(m_scrollbar.scrollbarOverlayStyle( ));
115 } 115 }
116 116
117 void WebScrollbarThemeClientImpl::getTickmarks(Vector<IntRect>& tickmarks) const 117 void WebScrollbarThemeClientImpl::getTickmarks(Vector<IntRect>& tickmarks) const
118 { 118 {
119 WebVector<WebRect> webTickmarks; 119 WebVector<WebRect> webTickmarks;
120 m_scrollbar->getTickmarks(webTickmarks); 120 m_scrollbar.getTickmarks(webTickmarks);
121 tickmarks.resize(webTickmarks.size()); 121 tickmarks.resize(webTickmarks.size());
122 for (size_t i = 0; i < webTickmarks.size(); ++i) 122 for (size_t i = 0; i < webTickmarks.size(); ++i)
123 tickmarks[i] = webTickmarks[i]; 123 tickmarks[i] = webTickmarks[i];
124 } 124 }
125 125
126 bool WebScrollbarThemeClientImpl::isScrollableAreaActive() const 126 bool WebScrollbarThemeClientImpl::isScrollableAreaActive() const
127 { 127 {
128 return m_scrollbar->isScrollableAreaActive(); 128 return m_scrollbar.isScrollableAreaActive();
129 } 129 }
130 130
131 IntPoint WebScrollbarThemeClientImpl::convertFromRootFrame(const IntPoint& point InRootFrame) const 131 IntPoint WebScrollbarThemeClientImpl::convertFromRootFrame(const IntPoint& point InRootFrame) const
132 { 132 {
133 // Unused by Chromium scrollbar themes. 133 // Unused by Chromium scrollbar themes.
134 ASSERT_NOT_REACHED(); 134 ASSERT_NOT_REACHED();
135 return pointInRootFrame; 135 return pointInRootFrame;
136 } 136 }
137 137
138 bool WebScrollbarThemeClientImpl::isCustomScrollbar() const 138 bool WebScrollbarThemeClientImpl::isCustomScrollbar() const
139 { 139 {
140 return m_scrollbar->isCustomScrollbar(); 140 return m_scrollbar.isCustomScrollbar();
141 } 141 }
142 142
143 ScrollbarOrientation WebScrollbarThemeClientImpl::orientation() const 143 ScrollbarOrientation WebScrollbarThemeClientImpl::orientation() const
144 { 144 {
145 return static_cast<ScrollbarOrientation>(m_scrollbar->orientation()); 145 return static_cast<ScrollbarOrientation>(m_scrollbar.orientation());
146 } 146 }
147 147
148 bool WebScrollbarThemeClientImpl::isLeftSideVerticalScrollbar() const 148 bool WebScrollbarThemeClientImpl::isLeftSideVerticalScrollbar() const
149 { 149 {
150 return m_scrollbar->isLeftSideVerticalScrollbar(); 150 return m_scrollbar.isLeftSideVerticalScrollbar();
151 } 151 }
152 152
153 int WebScrollbarThemeClientImpl::value() const 153 int WebScrollbarThemeClientImpl::value() const
154 { 154 {
155 return m_scrollbar->value(); 155 return m_scrollbar.value();
156 } 156 }
157 157
158 float WebScrollbarThemeClientImpl::currentPos() const 158 float WebScrollbarThemeClientImpl::currentPos() const
159 { 159 {
160 return value(); 160 return value();
161 } 161 }
162 162
163 int WebScrollbarThemeClientImpl::visibleSize() const 163 int WebScrollbarThemeClientImpl::visibleSize() const
164 { 164 {
165 return totalSize() - maximum(); 165 return totalSize() - maximum();
166 } 166 }
167 167
168 int WebScrollbarThemeClientImpl::totalSize() const 168 int WebScrollbarThemeClientImpl::totalSize() const
169 { 169 {
170 return m_scrollbar->totalSize(); 170 return m_scrollbar.totalSize();
171 } 171 }
172 172
173 int WebScrollbarThemeClientImpl::maximum() const 173 int WebScrollbarThemeClientImpl::maximum() const
174 { 174 {
175 return m_scrollbar->maximum(); 175 return m_scrollbar.maximum();
176 } 176 }
177 177
178 ScrollbarControlSize WebScrollbarThemeClientImpl::controlSize() const 178 ScrollbarControlSize WebScrollbarThemeClientImpl::controlSize() const
179 { 179 {
180 return static_cast<ScrollbarControlSize>(m_scrollbar->controlSize()); 180 return static_cast<ScrollbarControlSize>(m_scrollbar.controlSize());
181 } 181 }
182 182
183 ScrollbarPart WebScrollbarThemeClientImpl::pressedPart() const 183 ScrollbarPart WebScrollbarThemeClientImpl::pressedPart() const
184 { 184 {
185 return static_cast<ScrollbarPart>(m_scrollbar->pressedPart()); 185 return static_cast<ScrollbarPart>(m_scrollbar.pressedPart());
186 } 186 }
187 187
188 ScrollbarPart WebScrollbarThemeClientImpl::hoveredPart() const 188 ScrollbarPart WebScrollbarThemeClientImpl::hoveredPart() const
189 { 189 {
190 return static_cast<ScrollbarPart>(m_scrollbar->hoveredPart()); 190 return static_cast<ScrollbarPart>(m_scrollbar.hoveredPart());
191 } 191 }
192 192
193 void WebScrollbarThemeClientImpl::styleChanged() 193 void WebScrollbarThemeClientImpl::styleChanged()
194 { 194 {
195 ASSERT_NOT_REACHED(); 195 ASSERT_NOT_REACHED();
196 } 196 }
197 197
198 void WebScrollbarThemeClientImpl::visibilityChanged() 198 void WebScrollbarThemeClientImpl::visibilityChanged()
199 { 199 {
200 } 200 }
201 201
202 bool WebScrollbarThemeClientImpl::enabled() const 202 bool WebScrollbarThemeClientImpl::enabled() const
203 { 203 {
204 return m_scrollbar->enabled(); 204 return m_scrollbar.enabled();
205 } 205 }
206 206
207 void WebScrollbarThemeClientImpl::setEnabled(bool) 207 void WebScrollbarThemeClientImpl::setEnabled(bool)
208 { 208 {
209 ASSERT_NOT_REACHED(); 209 ASSERT_NOT_REACHED();
210 } 210 }
211 211
212 bool WebScrollbarThemeClientImpl::isOverlayScrollbar() const 212 bool WebScrollbarThemeClientImpl::isOverlayScrollbar() const
213 { 213 {
214 return m_scrollbar->isOverlay(); 214 return m_scrollbar.isOverlay();
215 } 215 }
216 216
217 bool WebScrollbarThemeClientImpl::isAlphaLocked() const 217 bool WebScrollbarThemeClientImpl::isAlphaLocked() const
218 { 218 {
219 return m_scrollbar->isAlphaLocked(); 219 return m_scrollbar.isAlphaLocked();
220 } 220 }
221 221
222 void WebScrollbarThemeClientImpl::setIsAlphaLocked(bool flag) 222 void WebScrollbarThemeClientImpl::setIsAlphaLocked(bool flag)
223 { 223 {
224 m_scrollbar->setIsAlphaLocked(flag); 224 m_scrollbar.setIsAlphaLocked(flag);
225 } 225 }
226 226
227 float WebScrollbarThemeClientImpl::elasticOverscroll() const 227 float WebScrollbarThemeClientImpl::elasticOverscroll() const
228 { 228 {
229 return m_scrollbar->elasticOverscroll(); 229 return m_scrollbar.elasticOverscroll();
230 } 230 }
231 231
232 void WebScrollbarThemeClientImpl::setElasticOverscroll(float elasticOverscroll) 232 void WebScrollbarThemeClientImpl::setElasticOverscroll(float elasticOverscroll)
233 { 233 {
234 return m_scrollbar->setElasticOverscroll(elasticOverscroll); 234 return m_scrollbar.setElasticOverscroll(elasticOverscroll);
235 } 235 }
236 236
237 bool WebScrollbarThemeClientImpl::trackNeedsRepaint() const 237 bool WebScrollbarThemeClientImpl::trackNeedsRepaint() const
238 { 238 {
239 return true; 239 return true;
240 } 240 }
241 241
242 void WebScrollbarThemeClientImpl::setTrackNeedsRepaint(bool) 242 void WebScrollbarThemeClientImpl::setTrackNeedsRepaint(bool)
243 { 243 {
244 ASSERT_NOT_REACHED(); 244 ASSERT_NOT_REACHED();
245 } 245 }
246 246
247 bool WebScrollbarThemeClientImpl::thumbNeedsRepaint() const 247 bool WebScrollbarThemeClientImpl::thumbNeedsRepaint() const
248 { 248 {
249 return true; 249 return true;
250 } 250 }
251 251
252 void WebScrollbarThemeClientImpl::setThumbNeedsRepaint(bool) 252 void WebScrollbarThemeClientImpl::setThumbNeedsRepaint(bool)
253 { 253 {
254 ASSERT_NOT_REACHED(); 254 ASSERT_NOT_REACHED();
255 } 255 }
256 256
257 String WebScrollbarThemeClientImpl::debugName() const 257 String WebScrollbarThemeClientImpl::debugName() const
258 { 258 {
259 return "WebScrollbarThemeClientImpl"; 259 return "WebScrollbarThemeClientImpl";
260 } 260 }
261 261
262 } // namespace blink 262 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698