WebCore/platform/ScrollAnimatorWin.cpp - Issue 3364013: Merge 67001 - 2010-09-08 Peter Kasting <pkasting@google.com>...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: WebCore/platform/ScrollAnimatorWin.cpp

Issue 3364013: Merge 67001 - 2010-09-08 Peter Kasting <pkasting@google.com>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/

Patch Set: Created 10 years, 3 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 unified diff | Download patch

« no previous file with comments | « WebCore/platform/ScrollAnimatorWin.h ('k') | WebCore/platform/ScrollView.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2010, Google Inc. All rights reserved.	2 * Copyright (c) 2010, Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 276 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
287 if (*data->m_currentPos > data->m_desiredPos)	287 if (*data->m_currentPos > data->m_desiredPos)

288 distanceTraveled = -distanceTraveled;	288 distanceTraveled = -distanceTraveled;

289 *data->m_currentPos += distanceTraveled;	289 *data->m_currentPos += distanceTraveled;

290 data->m_animationTimer.startOneShot(animationTimerDelay);	290 data->m_animationTimer.startOneShot(animationTimerDelay);

291 data->m_lastAnimationTime = WTF::currentTime();	291 data->m_lastAnimationTime = WTF::currentTime();

292 }	292 }

293 m_client->setScrollOffsetFromAnimation(IntPoint(m_horizontalData.m_currentP os, m_verticalData.m_currentPos));	293 m_client->setScrollOffsetFromAnimation(IntPoint(m_horizontalData.m_currentP os, m_verticalData.m_currentPos));

294 }	294 }

295	295

296 } // namespace WebCore	296 } // namespace WebCore

OLD	NEW