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

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

Issue 2832883003: Remove unneeded Convert* methods and move many from FrameViewBase to FrameView (Closed)
Patch Set: fix ScrollableArea::ConvertFromScrollbarToContainingFrameViewBase and remove dchecks Created 3 years, 8 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 FrameViewBase* Root() const override { return FrameViewBase::Root(); } 79 FrameViewBase* Root() const override { return FrameViewBase::Root(); }
80 80
81 void SetFrameRect(const IntRect&) override; 81 void SetFrameRect(const IntRect&) override;
82 IntRect FrameRect() const override { return FrameViewBase::FrameRect(); } 82 IntRect FrameRect() const override { return FrameViewBase::FrameRect(); }
83 83
84 ScrollbarOverlayColorTheme GetScrollbarOverlayColorTheme() const override; 84 ScrollbarOverlayColorTheme GetScrollbarOverlayColorTheme() const override;
85 void GetTickmarks(Vector<IntRect>&) const override; 85 void GetTickmarks(Vector<IntRect>&) const override;
86 bool IsScrollableAreaActive() const override; 86 bool IsScrollableAreaActive() const override;
87 87
88 IntPoint ConvertFromRootFrame( 88 IntPoint ConvertFromRootFrame(
89 const IntPoint& point_in_root_frame) const override { 89 const IntPoint& point_in_root_frame) const override;
90 return FrameViewBase::ConvertFromRootFrame(point_in_root_frame);
91 }
92 90
93 bool IsCustomScrollbar() const override { return false; } 91 bool IsCustomScrollbar() const override { return false; }
94 ScrollbarOrientation Orientation() const override { return orientation_; } 92 ScrollbarOrientation Orientation() const override { return orientation_; }
95 bool IsLeftSideVerticalScrollbar() const override; 93 bool IsLeftSideVerticalScrollbar() const override;
96 94
97 int Value() const override { return lroundf(current_pos_); } 95 int Value() const override { return lroundf(current_pos_); }
98 float CurrentPos() const override { return current_pos_; } 96 float CurrentPos() const override { return current_pos_; }
99 int VisibleSize() const override { return visible_size_; } 97 int VisibleSize() const override { return visible_size_; }
100 int TotalSize() const override { return total_size_; } 98 int TotalSize() const override { return total_size_; }
101 int Maximum() const override { return total_size_ - visible_size_; } 99 int Maximum() const override { return total_size_ - visible_size_; }
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 void MouseEntered(); 148 void MouseEntered();
151 void MouseExited(); 149 void MouseExited();
152 150
153 // Used by some platform scrollbars to know when they've been released from 151 // Used by some platform scrollbars to know when they've been released from
154 // capture. 152 // capture.
155 void MouseUp(const WebMouseEvent&); 153 void MouseUp(const WebMouseEvent&);
156 void MouseDown(const WebMouseEvent&); 154 void MouseDown(const WebMouseEvent&);
157 155
158 ScrollbarTheme& GetTheme() const { return theme_; } 156 ScrollbarTheme& GetTheme() const { return theme_; }
159 157
160 IntRect ConvertToContainingFrameViewBase(const IntRect&) const override; 158 IntRect ConvertToContainingFrameViewBase(const IntRect&) const;
161 IntRect ConvertFromContainingFrameViewBase(const IntRect&) const override;
162
163 IntPoint ConvertToContainingFrameViewBase(const IntPoint&) const override;
164 IntPoint ConvertFromContainingFrameViewBase(const IntPoint&) const override; 159 IntPoint ConvertFromContainingFrameViewBase(const IntPoint&) const override;
165 160
166 void MoveThumb(int pos, bool dragging_document = false); 161 void MoveThumb(int pos, bool dragging_document = false);
167 162
168 float ElasticOverscroll() const override { return elastic_overscroll_; } 163 float ElasticOverscroll() const override { return elastic_overscroll_; }
169 void SetElasticOverscroll(float elastic_overscroll) override { 164 void SetElasticOverscroll(float elastic_overscroll) override {
170 elastic_overscroll_ = elastic_overscroll; 165 elastic_overscroll_ = elastic_overscroll;
171 } 166 }
172 167
173 // Use setNeedsPaintInvalidation to cause the scrollbar (or parts thereof) 168 // Use setNeedsPaintInvalidation to cause the scrollbar (or parts thereof)
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 258
264 DEFINE_TYPE_CASTS(Scrollbar, 259 DEFINE_TYPE_CASTS(Scrollbar,
265 FrameViewBase, 260 FrameViewBase,
266 frameViewBase, 261 frameViewBase,
267 frameViewBase->IsScrollbar(), 262 frameViewBase->IsScrollbar(),
268 frameViewBase.IsScrollbar()); 263 frameViewBase.IsScrollbar());
269 264
270 } // namespace blink 265 } // namespace blink
271 266
272 #endif // Scrollbar_h 267 #endif // Scrollbar_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ScrollableArea.h ('k') | third_party/WebKit/Source/platform/scroll/Scrollbar.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698