Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Unified Diff: third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp

Issue 1860903002: Update Source/platform/ to assume Oilpan only. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: back out ScrollAnimatorMac() accidental change Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
index 839bd06ca7c26b956c2f68711cb55b0fe84ee209..f1aff6137b9a24f8171f984e4925f01b398067f7 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
@@ -40,7 +40,6 @@
#include "platform/scroll/MainThreadScrollingReason.h"
#include "platform/scroll/ProgrammaticScrollAnimator.h"
#include "platform/scroll/ScrollbarTheme.h"
-#include "wtf/PassOwnPtr.h"
#include "platform/TraceEvent.h"
@@ -51,7 +50,7 @@ namespace blink {
struct SameSizeAsScrollableArea {
virtual ~SameSizeAsScrollableArea();
-#if ENABLE(ASSERT) && ENABLE(OILPAN)
+#if ENABLE(ASSERT)
VerifyEagerFinalization verifyEager;
#endif
Member<void*> pointer[2];
@@ -94,9 +93,7 @@ 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

Powered by Google App Engine
This is Rietveld 408576698