| Index: third_party/WebKit/Source/platform/scroll/ScrollableArea.h
|
| diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
|
| index a6904b6c42c68573bdf84d914f2ea71016a9b79b..ef668ea0a35e7a57cd3fc4724094502f88cb5f13 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
|
| @@ -62,7 +62,7 @@ enum IncludeScrollbarsInRect {
|
| };
|
|
|
| #if ENABLE(OILPAN)
|
| -// Oilpan: Using the transition type WillBeGarbageCollectedMixin is
|
| +// Oilpan: Using the transition type GarbageCollectedMixin 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
|
| @@ -335,8 +335,8 @@ private:
|
| virtual int documentStep(ScrollbarOrientation) const;
|
| virtual float pixelStep(ScrollbarOrientation) const;
|
|
|
| - mutable OwnPtrWillBeMember<ScrollAnimatorBase> m_scrollAnimator;
|
| - mutable OwnPtrWillBeMember<ProgrammaticScrollAnimator> m_programmaticScrollAnimator;
|
| + mutable Member<ScrollAnimatorBase> m_scrollAnimator;
|
| + mutable Member<ProgrammaticScrollAnimator> m_programmaticScrollAnimator;
|
|
|
| unsigned m_inLiveResize : 1;
|
|
|
|
|