Chromium Code Reviews| Index: Source/platform/scroll/ScrollableArea.h |
| diff --git a/Source/platform/scroll/ScrollableArea.h b/Source/platform/scroll/ScrollableArea.h |
| index 0c925c5fd79fd5d9e259b2a3687d0193a332ad7b..2b0b9d704d34ce2c446464356e6907e430a3f97b 100644 |
| --- a/Source/platform/scroll/ScrollableArea.h |
| +++ b/Source/platform/scroll/ScrollableArea.h |
| @@ -29,6 +29,7 @@ |
| #include "platform/PlatformExport.h" |
| #include "platform/RuntimeEnabledFeatures.h" |
| #include "platform/geometry/DoublePoint.h" |
| +#include "platform/heap/Handle.h" |
| #include "platform/scroll/ScrollAnimator.h" |
| #include "platform/scroll/ScrollTypes.h" |
| #include "platform/scroll/Scrollbar.h" |
| @@ -57,7 +58,16 @@ enum IncludeScrollbarsInRect { |
| IncludeScrollbars, |
| }; |
| +#if ENABLE(OILPAN) |
| +// Oilpan: Using the transition type WillBeGarbageCollectedMixin is |
| +// problematic non-Oilpan as the type expands to DummyBase, exporting it |
| +// also from 'platform' as a result. Bringing about duplicate DummyBases |
| +// as core also exports same; with component build linking fails as a |
| +// result. Hence the workaround of not using a transition type. |
| +class PLATFORM_EXPORT ScrollableArea : public GarbageCollectedMixin { |
| +#else |
| class PLATFORM_EXPORT ScrollableArea { |
| +#endif |
| WTF_MAKE_NONCOPYABLE(ScrollableArea); |
| public: |
| static int pixelsPerLineStep(); |
| @@ -289,6 +299,11 @@ public: |
| // Subtracts space occupied by this ScrollableArea's scrollbars. |
| // Does nothing if overlay scrollbars are enabled. |
| IntSize excludeScrollbars(const IntSize&) const; |
| + |
| + // Need to promptly let go of owned animator objects. |
|
haraken
2015/06/29 15:20:22
I don't fully understand this -- why do we need to
sof
2015/06/29 15:59:41
Look at ScrollAnimatorMac and the back references
|
| + EAGERLY_FINALIZE(); |
| + DEFINE_INLINE_VIRTUAL_TRACE() { } |
| + |
| protected: |
| ScrollableArea(); |
| @@ -327,7 +342,7 @@ private: |
| IntRect m_verticalBarDamage; |
| struct ScrollableAreaAnimators { |
| - RefPtr<ScrollAnimator> scrollAnimator; |
| + OwnPtr<ScrollAnimator> scrollAnimator; |
| OwnPtr<ProgrammaticScrollAnimator> programmaticScrollAnimator; |
| }; |