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

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

Issue 24130008: Rename ENABLE(RUBBER_BANDING) to USE(RUBBER_BANDING). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 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
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 12 matching lines...) Expand all
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 32
33 #if ENABLE(RUBBER_BANDING) 33 #if USE(RUBBER_BANDING)
34 34
35 static NSTimeInterval systemUptime() 35 static NSTimeInterval systemUptime()
36 { 36 {
37 if ([[NSProcessInfo processInfo] respondsToSelector:@selector(systemUptime)] ) 37 if ([[NSProcessInfo processInfo] respondsToSelector:@selector(systemUptime)] )
38 return [[NSProcessInfo processInfo] systemUptime]; 38 return [[NSProcessInfo processInfo] systemUptime];
39 39
40 // Get how long system has been up. Found by looking getting "boottime" from the kernel. 40 // Get how long system has been up. Found by looking getting "boottime" from the kernel.
41 static struct timeval boottime = {0, 0}; 41 static struct timeval boottime = {0, 0};
42 if (!boottime.tv_sec) { 42 if (!boottime.tv_sec) {
43 int mib[2] = {CTL_KERN, KERN_BOOTTIME}; 43 int mib[2] = {CTL_KERN, KERN_BOOTTIME};
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 if (wheelEvent.deltaX() > 0) 406 if (wheelEvent.deltaX() > 0)
407 return m_client->shouldRubberBandInDirection(ScrollLeft); 407 return m_client->shouldRubberBandInDirection(ScrollLeft);
408 if (wheelEvent.deltaX() < 0) 408 if (wheelEvent.deltaX() < 0)
409 return m_client->shouldRubberBandInDirection(ScrollRight); 409 return m_client->shouldRubberBandInDirection(ScrollRight);
410 410
411 return true; 411 return true;
412 } 412 }
413 413
414 } // namespace WebCore 414 } // namespace WebCore
415 415
416 #endif // ENABLE(RUBBER_BANDING) 416 #endif // USE(RUBBER_BANDING)
OLDNEW
« no previous file with comments | « Source/core/platform/mac/ScrollElasticityController.h ('k') | Source/core/rendering/RenderLayerCompositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698