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

Unified Diff: Source/platform/scroll/Scrollbar.h

Issue 1209293004: WIP - improve ScrollableArea handling. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebased Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/scroll/ScrollableAreaTest.cpp ('k') | Source/platform/scroll/Scrollbar.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/scroll/Scrollbar.h
diff --git a/Source/platform/scroll/Scrollbar.h b/Source/platform/scroll/Scrollbar.h
index 20979ff328b90fd6980364552842af5700a93e25..fd8224d8f90f25954a1c09bf5867f4ee5aad9e32 100644
--- a/Source/platform/scroll/Scrollbar.h
+++ b/Source/platform/scroll/Scrollbar.h
@@ -46,7 +46,6 @@ class ScrollableArea;
class ScrollbarTheme;
class PLATFORM_EXPORT Scrollbar : public Widget, public ScrollbarThemeClient {
-
public:
static PassRefPtrWillBeRawPtr<Scrollbar> create(ScrollableArea*, ScrollbarOrientation, ScrollbarControlSize);
@@ -153,6 +152,12 @@ public:
virtual DisplayItemClient displayItemClient() const override { return toDisplayItemClient(this); }
virtual String debugName() const override { return m_orientation == HorizontalScrollbar ? "HorizontalScrollbar" : "VerticalScrollbar"; }
+ EAGERLY_FINALIZE();
+#if ENABLE(OILPAN)
+ DECLARE_EAGER_FINALIZATION_OPERATOR_NEW();
+#endif
+ DECLARE_VIRTUAL_TRACE();
+
protected:
Scrollbar(ScrollableArea*, ScrollbarOrientation, ScrollbarControlSize, ScrollbarTheme* = 0);
@@ -167,18 +172,11 @@ protected:
ScrollDirectionPhysical pressedPartScrollDirectionPhysical();
ScrollGranularity pressedPartScrollGranularity();
- ScrollableArea* m_scrollableArea;
+ RawPtrWillBeMember<ScrollableArea> m_scrollableArea;
ScrollbarOrientation m_orientation;
ScrollbarControlSize m_controlSize;
ScrollbarTheme* m_theme;
-#if ENABLE(OILPAN)
- // To simplify Oilpan finalization, keep a copy of the ScrollableArea's
- // scroll animator. Scrollbar is responsible for notifying the animator
- // when it is destructed.
- RefPtr<ScrollAnimator> m_animator;
-#endif
-
int m_visibleSize;
int m_totalSize;
float m_currentPos;
« no previous file with comments | « Source/platform/scroll/ScrollableAreaTest.cpp ('k') | Source/platform/scroll/Scrollbar.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698