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

Side by Side Diff: Source/core/platform/mac/ScrollElasticityController.mm

Issue 14856004: Finish removing WebKitSystemInterface from Blink. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Simplify Created 7 years, 7 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 11 matching lines...) Expand all
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/platform/mac/ScrollElasticityController.h" 27 #include "core/platform/mac/ScrollElasticityController.h"
28 28
29 #include <sys/sysctl.h> 29 #include <sys/sysctl.h>
30 #include <sys/time.h> 30 #include <sys/time.h>
31 #include "core/platform/PlatformWheelEvent.h" 31 #include "core/platform/PlatformWheelEvent.h"
32 #include "core/platform/mac/WebCoreSystemInterface.h"
33 32
34 #if ENABLE(RUBBER_BANDING) 33 #if ENABLE(RUBBER_BANDING)
35 34
36 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050 35 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
37 @interface NSProcessInfo (ScrollAnimatorMacExt) 36 @interface NSProcessInfo (ScrollAnimatorMacExt)
38 - (NSTimeInterval)systemUptime; 37 - (NSTimeInterval)systemUptime;
39 @end 38 @end
40 #endif 39 #endif
41 40
42 #if ENABLE(RUBBER_BANDING) 41 #if ENABLE(RUBBER_BANDING)
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 return m_client->shouldRubberBandInDirection(ScrollLeft); 413 return m_client->shouldRubberBandInDirection(ScrollLeft);
415 if (wheelEvent.deltaX() < 0) 414 if (wheelEvent.deltaX() < 0)
416 return m_client->shouldRubberBandInDirection(ScrollRight); 415 return m_client->shouldRubberBandInDirection(ScrollRight);
417 416
418 return true; 417 return true;
419 } 418 }
420 419
421 } // namespace WebCore 420 } // namespace WebCore
422 421
423 #endif // ENABLE(RUBBER_BANDING) 422 #endif // ENABLE(RUBBER_BANDING)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698