third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp - Issue 1860903002: Update Source/platform/ to assume Oilpan only.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.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

« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.h ('k') | third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp

diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp

index d27bebbab5362d00d3257d8ccd5872f92b8e2e39..5dcc838fcfe1c0a0e10bc00ad189a783e977f59e 100644

--- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp

+++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp

@@ -22,9 +22,7 @@ ScrollAnimatorCompositorCoordinator::ScrollAnimatorCompositorCoordinator()

, m_compositorAnimationId(0)

, m_compositorAnimationGroupId(0)

{

-#if ENABLE(OILPAN)

ThreadState::current()->registerPreFinalizer(this);

-#endif

m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimationPlayer());

ASSERT(m_compositorPlayer);

m_compositorPlayer->setAnimationDelegate(this);

@@ -32,9 +30,6 @@ ScrollAnimatorCompositorCoordinator::ScrollAnimatorCompositorCoordinator()

ScrollAnimatorCompositorCoordinator::~ScrollAnimatorCompositorCoordinator()

{

-#if !ENABLE(OILPAN)

- ScrollAnimatorCompositorCoordinator::dispose();

-#endif

}

void ScrollAnimatorCompositorCoordinator::dispose()