Source/WebCore/platform/ScrollAnimator.cpp - Issue 7044088: Merge 88286 - 2011-06-07 Sailesh Agrawal <sail@chromium.org>

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: Source/WebCore/platform/ScrollAnimator.cpp

Issue 7044088: Merge 88286 - 2011-06-07 Sailesh Agrawal <sail@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/

Patch Set: Created 9 years, 6 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: Source/WebCore/platform/ScrollAnimator.cpp

===================================================================

--- Source/WebCore/platform/ScrollAnimator.cpp (revision 88458)

+++ Source/WebCore/platform/ScrollAnimator.cpp (working copy)

@@ -41,7 +41,7 @@

namespace WebCore {

-#if !ENABLE(SMOOTH_SCROLLING)

+#if !ENABLE(SMOOTH_SCROLLING) && !(PLATFORM(CHROMIUM) && OS(DARWIN))

PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea)

{

return adoptPtr(new ScrollAnimator(scrollableArea));

« no previous file with comments | « Source/WebCore/WebCore.gyp/WebCore.gyp ('k') | Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.h » ('j') | no next file with comments »