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

Unified Diff: third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h

Issue 1477113003: [Oilpan] Move ScrollAnimators onto oilpan heap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Do not touch on-heap objects in destructors Created 5 years 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
Index: third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h
diff --git a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h
index e324f1b826bf2bf1ca22c861547e7b2228eac596..eccad162ca5eeb933924e3f94e889de6cd7f05af 100644
--- a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h
+++ b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h
@@ -30,6 +30,7 @@
#include "platform/geometry/FloatPoint.h"
#include "platform/geometry/FloatSize.h"
#include "platform/geometry/IntRect.h"
+#include "platform/heap/Handle.h"
#include "platform/scroll/ScrollAnimatorBase.h"
#include "wtf/RetainPtr.h"
@@ -44,11 +45,13 @@ namespace blink {
class Scrollbar;
class PLATFORM_EXPORT ScrollAnimatorMac : public ScrollAnimatorBase {
-
+ USING_PRE_FINALIZER(ScrollAnimatorMac, cleanup);
public:
ScrollAnimatorMac(ScrollableArea*);
~ScrollAnimatorMac() override;
+ void cleanup() override;
+
void immediateScrollToPointForScrollAnimation(const FloatPoint& newPosition);
bool haveScrolledSincePageLoad() const { return m_haveScrolledSincePageLoad; }
@@ -64,6 +67,11 @@ public:
static bool canUseCoordinatedScrollbar();
+ DEFINE_INLINE_VIRTUAL_TRACE()
+ {
+ ScrollAnimatorBase::trace(visitor);
+ }
+
private:
RetainPtr<id> m_scrollAnimationHelper;
RetainPtr<WebScrollAnimationHelperDelegate> m_scrollAnimationHelperDelegate;

Powered by Google App Engine
This is Rietveld 408576698