Update Source/platform/ to assume Oilpan only.

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 44 matching lines @@
     ScrollBehaviorAuto,
     ScrollBehaviorInstant,
     ScrollBehaviorSmooth,
 };
 
 enum IncludeScrollbarsInRect {
     ExcludeScrollbars,
     IncludeScrollbars,
 };
 
-#if ENABLE(OILPAN)
-// 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:
     static int pixelsPerLineStep(HostWindow*);
     static float minFractionToStepWhenPaging();
     static int maxOverlapBetweenPages();
 
     // Convert a non-finite scroll value (Infinity, -Infinity, NaN) to 0 as
     // per http://dev.w3.org/csswg/cssom-view/#normalize-non_finite-values.
     static double normalizeNonFiniteScroll(double value) { return std::isfinite(value) ? value : 0.0; }
 
@@ skipping 38 matching lines @@
 
     bool hasOverlayScrollbars() const;
     void setScrollbarOverlayStyle(ScrollbarOverlayStyle);
     void recalculateScrollbarOverlayStyle(Color);
     ScrollbarOverlayStyle getScrollbarOverlayStyle() const { return static_cast<ScrollbarOverlayStyle>(m_scrollbarOverlayStyle); }
 
     // This getter will create a ScrollAnimatorBase if it doesn't already exist.
     ScrollAnimatorBase& scrollAnimator() const;
 
     // This getter will return null if the ScrollAnimatorBase hasn't been created yet.
-    ScrollAnimatorBase* existingScrollAnimator() const { return m_scrollAnimator.get(); }
+    ScrollAnimatorBase* existingScrollAnimator() const { return m_scrollAnimator; }
 
     ProgrammaticScrollAnimator& programmaticScrollAnimator() const;
-    ProgrammaticScrollAnimator* existingProgrammaticScrollAnimator() const { return m_programmaticScrollAnimator.get(); }
+    ProgrammaticScrollAnimator* existingProgrammaticScrollAnimator() const { return m_programmaticScrollAnimator; }
 
     virtual CompositorAnimationTimeline* compositorAnimationTimeline() const { return nullptr; }
 
     const IntPoint& scrollOrigin() const { return m_scrollOrigin; }
     bool scrollOriginChanged() const { return m_scrollOriginChanged; }
 
 
     // This is used to determine whether the incoming fractional scroll offset should
     // be truncated to integer. Current rule is that if preferCompositingToLCDTextEnabled()
     // is disabled (which is true on low-dpi device by default) we should do the truncation.
@@ skipping 198 matching lines @@
     // 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