Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/platform/scroll/ScrollableArea.h

 /*
  * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 45 matching lines @@
     ScrollBehaviorInstant,
     ScrollBehaviorSmooth,
 };
 
 enum IncludeScrollbarsInRect {
     ExcludeScrollbars,
     IncludeScrollbars,
 };
 
 #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
 // 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:
@@ skipping 242 matching lines @@
     void userScrollHelper(const DoublePoint&, ScrollBehavior);
 
     // This function should be overriden by subclasses to perform the actual scroll of the content.
     virtual void setScrollOffset(const DoublePoint& offset, ScrollType) = 0;
 
     virtual int lineStep(ScrollbarOrientation) const;
     virtual int pageStep(ScrollbarOrientation) const;
     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_scrollbarOverlayStyle : 2; // ScrollbarOverlayStyle
 
     unsigned m_scrollOriginChanged : 1;
 
     unsigned m_horizontalScrollbarNeedsPaintInvalidation : 1;
     unsigned m_verticalScrollbarNeedsPaintInvalidation : 1;
     unsigned m_scrollCornerNeedsPaintInvalidation : 1;
 
     // There are 6 possible combinations of writing mode and direction. Scroll origin will be non-zero in the x or y axis
     // if there is any reversed direction or writing-mode. The combinations are:
     // writing-mode / direction     scrollOrigin.x() set    scrollOrigin.y() set
     // horizontal-tb / ltr          NO                      NO
     // horizontal-tb / rtl          YES                     NO
     // vertical-lr / ltr            NO                      NO
     // vertical-lr / rtl            NO                      YES
     // vertical-rl / ltr            YES                     NO
     // vertical-rl / rtl            YES                     YES
     IntPoint m_scrollOrigin;
 };
 
 } // namespace blink
 
 #endif // ScrollableArea_h