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

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

Issue 648913002: Clean up vestiges of ScrollView. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « Source/platform/scroll/ScrollableArea.h ('k') | Source/platform/scroll/Scrollbar.cpp » ('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) 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 virtual void setFrameRect(const IntRect& frameRect) override { Widget::setFr ameRect(frameRect); } 64 virtual void setFrameRect(const IntRect& frameRect) override { Widget::setFr ameRect(frameRect); }
65 virtual IntRect frameRect() const override { return Widget::frameRect(); } 65 virtual IntRect frameRect() const override { return Widget::frameRect(); }
66 66
67 virtual void invalidate() override { Widget::invalidate(); } 67 virtual void invalidate() override { Widget::invalidate(); }
68 virtual void invalidateRect(const IntRect&) override; 68 virtual void invalidateRect(const IntRect&) override;
69 69
70 virtual ScrollbarOverlayStyle scrollbarOverlayStyle() const override; 70 virtual ScrollbarOverlayStyle scrollbarOverlayStyle() const override;
71 virtual void getTickmarks(Vector<IntRect>&) const override; 71 virtual void getTickmarks(Vector<IntRect>&) const override;
72 virtual bool isScrollableAreaActive() const override; 72 virtual bool isScrollableAreaActive() const override;
73 virtual bool isScrollViewScrollbar() const override;
74 73
75 virtual IntPoint convertFromContainingWindow(const IntPoint& windowPoint) ov erride { return Widget::convertFromContainingWindow(windowPoint); } 74 virtual IntPoint convertFromContainingWindow(const IntPoint& windowPoint) ov erride { return Widget::convertFromContainingWindow(windowPoint); }
76 75
77 virtual bool isCustomScrollbar() const override { return false; } 76 virtual bool isCustomScrollbar() const override { return false; }
78 virtual ScrollbarOrientation orientation() const override { return m_orienta tion; } 77 virtual ScrollbarOrientation orientation() const override { return m_orienta tion; }
79 virtual bool isLeftSideVerticalScrollbar() const override; 78 virtual bool isLeftSideVerticalScrollbar() const override;
80 79
81 virtual int value() const override { return lroundf(m_currentPos); } 80 virtual int value() const override { return lroundf(m_currentPos); }
82 virtual float currentPos() const override { return m_currentPos; } 81 virtual float currentPos() const override { return m_currentPos; }
83 virtual int visibleSize() const override { return m_visibleSize; } 82 virtual int visibleSize() const override { return m_visibleSize; }
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 virtual bool isScrollbar() const override { return true; } 189 virtual bool isScrollbar() const override { return true; }
191 190
192 float scrollableAreaCurrentPos() const; 191 float scrollableAreaCurrentPos() const;
193 }; 192 };
194 193
195 DEFINE_TYPE_CASTS(Scrollbar, Widget, widget, widget->isScrollbar(), widget.isScr ollbar()); 194 DEFINE_TYPE_CASTS(Scrollbar, Widget, widget, widget->isScrollbar(), widget.isScr ollbar());
196 195
197 } // namespace blink 196 } // namespace blink
198 197
199 #endif // Scrollbar_h 198 #endif // Scrollbar_h
OLDNEW
« no previous file with comments | « Source/platform/scroll/ScrollableArea.h ('k') | Source/platform/scroll/Scrollbar.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698