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

Side by Side Diff: Source/platform/scroll/ScrollView.h

Issue 631803002: Replacing the OVERRIDE with override and FINAL with final (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase issue 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2009 Holger Hans Peter Freyther 3 * Copyright (C) 2009 Holger Hans Peter Freyther
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 virtual void paintScrollbar(GraphicsContext*, Scrollbar*, const IntRect&); 241 virtual void paintScrollbar(GraphicsContext*, Scrollbar*, const IntRect&);
242 242
243 virtual IntRect convertFromScrollbarToContainingView(const Scrollbar*, const IntRect&) const override; 243 virtual IntRect convertFromScrollbarToContainingView(const Scrollbar*, const IntRect&) const override;
244 virtual IntRect convertFromContainingViewToScrollbar(const Scrollbar*, const IntRect&) const override; 244 virtual IntRect convertFromContainingViewToScrollbar(const Scrollbar*, const IntRect&) const override;
245 virtual IntPoint convertFromScrollbarToContainingView(const Scrollbar*, cons t IntPoint&) const override; 245 virtual IntPoint convertFromScrollbarToContainingView(const Scrollbar*, cons t IntPoint&) const override;
246 virtual IntPoint convertFromContainingViewToScrollbar(const Scrollbar*, cons t IntPoint&) const override; 246 virtual IntPoint convertFromContainingViewToScrollbar(const Scrollbar*, cons t IntPoint&) const override;
247 247
248 void calculateAndPaintOverhangAreas(GraphicsContext*, const IntRect& dirtyRe ct); 248 void calculateAndPaintOverhangAreas(GraphicsContext*, const IntRect& dirtyRe ct);
249 void calculateAndPaintOverhangBackground(GraphicsContext*, const IntRect& di rtyRect); 249 void calculateAndPaintOverhangBackground(GraphicsContext*, const IntRect& di rtyRect);
250 250
251 virtual bool isScrollView() const override FINAL { return true; } 251 virtual bool isScrollView() const override final { return true; }
252 252
253 protected: 253 protected:
254 ScrollView(); 254 ScrollView();
255 255
256 // NOTE: This should only be called by the overriden setScrollOffset from Sc rollableArea. 256 // NOTE: This should only be called by the overriden setScrollOffset from Sc rollableArea.
257 virtual void scrollTo(const DoublePoint& newPosition); 257 virtual void scrollTo(const DoublePoint& newPosition);
258 258
259 virtual void contentRectangleForPaintInvalidation(const IntRect&); 259 virtual void contentRectangleForPaintInvalidation(const IntRect&);
260 virtual void paintContents(GraphicsContext*, const IntRect& damageRect) = 0; 260 virtual void paintContents(GraphicsContext*, const IntRect& damageRect) = 0;
261 261
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 345
346 void calculateOverhangAreasForPainting(IntRect& horizontalOverhangRect, IntR ect& verticalOverhangRect); 346 void calculateOverhangAreasForPainting(IntRect& horizontalOverhangRect, IntR ect& verticalOverhangRect);
347 void updateOverhangAreas(); 347 void updateOverhangAreas();
348 }; // class ScrollView 348 }; // class ScrollView
349 349
350 DEFINE_TYPE_CASTS(ScrollView, Widget, widget, widget->isScrollView(), widget.isS crollView()); 350 DEFINE_TYPE_CASTS(ScrollView, Widget, widget, widget->isScrollView(), widget.isS crollView());
351 351
352 } // namespace blink 352 } // namespace blink
353 353
354 #endif // ScrollView_h 354 #endif // ScrollView_h
OLDNEW
« no previous file with comments | « Source/platform/plugins/PluginListBuilder.h ('k') | Source/platform/scroll/ScrollbarThemeMock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698