Update Source/platform/ to assume Oilpan only.

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

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  * 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 22 matching lines @@
 
 #include "platform/HostWindow.h"
 #include "platform/Logging.h"
 #include "platform/geometry/DoubleRect.h"
 #include "platform/geometry/FloatPoint.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/scroll/MainThreadScrollingReason.h"
 #include "platform/scroll/ProgrammaticScrollAnimator.h"
 #include "platform/scroll/ScrollbarTheme.h"
-#include "wtf/PassOwnPtr.h"
 
 #include "platform/TraceEvent.h"
 
 static const int kPixelsPerLineStep = 40;
 static const float kMinFractionToStepWhenPaging = 0.875f;
 
 namespace blink {
 
 struct SameSizeAsScrollableArea {
     virtual ~SameSizeAsScrollableArea();
-#if ENABLE(ASSERT) && ENABLE(OILPAN)
+#if ENABLE(ASSERT)
     VerifyEagerFinalization verifyEager;
 #endif
     Member<void*> pointer[2];
     unsigned bitfields : 16;
     IntPoint origin;
 };
 
 static_assert(sizeof(ScrollableArea) == sizeof(SameSizeAsScrollableArea), "ScrollableArea should stay small");
 
 int ScrollableArea::pixelsPerLineStep(HostWindow* host)
@@ skipping 22 matching lines @@
     , m_scrollCornerNeedsPaintInvalidation(false)
 {
 }
 
 ScrollableArea::~ScrollableArea()
 {
 }
 
 void ScrollableArea::clearScrollAnimators()
 {
-#if OS(MACOSX) && ENABLE(OILPAN)
-    // TODO(ymalik): Let oilpan decide when to call dispose rather than
-    // explicitly calling it here to cleanup.
+#if OS(MACOSX)
     if (m_scrollAnimator)
         m_scrollAnimator->dispose();
 #endif
     m_scrollAnimator.clear();
     m_programmaticScrollAnimator.clear();
 }
 
 ScrollAnimatorBase& ScrollableArea::scrollAnimator() const
 {
     if (!m_scrollAnimator)
@@ skipping 504 matching lines @@
         std::max(0, size.height() - horizontalScrollbarHeight));
 }
 
 DEFINE_TRACE(ScrollableArea)
 {
     visitor->trace(m_scrollAnimator);
     visitor->trace(m_programmaticScrollAnimator);
 }
 
 } // namespace blink