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

Side by Side Diff: third_party/WebKit/Source/platform/scroll/Scrollbar.h

Issue 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-13-platform: . Created 4 years, 9 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 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2004, 2006 Apple Computer, 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 int height() const override { return Widget::height(); } 62 int height() const override { return Widget::height(); }
63 IntSize size() const override { return Widget::size(); } 63 IntSize size() const override { return Widget::size(); }
64 IntPoint location() const override { return Widget::location(); } 64 IntPoint location() const override { return Widget::location(); }
65 65
66 Widget* parent() const override { return Widget::parent(); } 66 Widget* parent() const override { return Widget::parent(); }
67 Widget* root() const override { return Widget::root(); } 67 Widget* root() const override { return Widget::root(); }
68 68
69 void setFrameRect(const IntRect&) override; 69 void setFrameRect(const IntRect&) override;
70 IntRect frameRect() const override { return Widget::frameRect(); } 70 IntRect frameRect() const override { return Widget::frameRect(); }
71 71
72 ScrollbarOverlayStyle scrollbarOverlayStyle() const override; 72 ScrollbarOverlayStyle getScrollbarOverlayStyle() const override;
73 void getTickmarks(Vector<IntRect>&) const override; 73 void getTickmarks(Vector<IntRect>&) const override;
74 bool isScrollableAreaActive() const override; 74 bool isScrollableAreaActive() const override;
75 75
76 IntPoint convertFromRootFrame(const IntPoint& pointInRootFrame) const overri de { return Widget::convertFromRootFrame(pointInRootFrame); } 76 IntPoint convertFromRootFrame(const IntPoint& pointInRootFrame) const overri de { return Widget::convertFromRootFrame(pointInRootFrame); }
77 77
78 bool isCustomScrollbar() const override { return false; } 78 bool isCustomScrollbar() const override { return false; }
79 ScrollbarOrientation orientation() const override { return m_orientation; } 79 ScrollbarOrientation orientation() const override { return m_orientation; }
80 bool isLeftSideVerticalScrollbar() const override; 80 bool isLeftSideVerticalScrollbar() const override;
81 81
82 int value() const override { return lroundf(m_currentPos); } 82 int value() const override { return lroundf(m_currentPos); }
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 227
228 bool m_trackNeedsRepaint; 228 bool m_trackNeedsRepaint;
229 bool m_thumbNeedsRepaint; 229 bool m_thumbNeedsRepaint;
230 }; 230 };
231 231
232 DEFINE_TYPE_CASTS(Scrollbar, Widget, widget, widget->isScrollbar(), widget.isScr ollbar()); 232 DEFINE_TYPE_CASTS(Scrollbar, Widget, widget, widget->isScrollbar(), widget.isScr ollbar());
233 233
234 } // namespace blink 234 } // namespace blink
235 235
236 #endif // Scrollbar_h 236 #endif // Scrollbar_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp ('k') | third_party/WebKit/Source/platform/scroll/Scrollbar.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698