Changeset 97831 in webkit

Timestamp:

Oct 18, 2011 9:32:28 PM (13 years ago)

Author:

jnd@chromium.org

Message:

Source/WebCore: Implement NSProcessInfo::systemUptime on Mac Leopard.
​https://bugs.webkit.org/show_bug.cgi?id=66577

Reviewed by Tony Chang.

• WebCore.gyp/WebCore.gyp:
• platform/chromium/ScrollAnimatorChromiumMac.mm:

(-[NSProcessInfo systemUptime]):

LayoutTests: Enable touch tests on Mac Leopard.
​https://bugs.webkit.org/show_bug.cgi?id=66577

Reviewed by Tony Chang.

• platform/chromium/test_expectations.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.gyp/WebCore.gyp (modified) (1 diff)
• Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-18  Johnny Ding  <jnd@chromium.org>
+
+        Enable touch tests on Mac Leopard. 
+        https://bugs.webkit.org/show_bug.cgi?id=66577
+
+        Reviewed by Tony Chang.
+
+        * platform/chromium/test_expectations.txt:
+
 2011-10-18  Ojan Vafai  <ojan@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -3475 +3475 @@
 BUGWK66569 SLOW LINUX WIN DEBUG : http/tests/inspector/network/network-iframe-load-and-delete.html = PASS
 
-BUGWK66577 LEOPARD : fast/events/touch/basic-single-touch-events.html = TIMEOUT
-BUGWK66577 LEOPARD : fast/events/touch/multi-touch-grouped-targets.html = TIMEOUT
-BUGWK66577 LEOPARD : fast/events/touch/touch-gesture-scroll.html = TIMEOUT
-BUGWK66577 LEOPARD : fast/events/touch/touch-target-limited.html = TIMEOUT
-BUGWK66577 LEOPARD : fast/events/touch/touch-target.html = TIMEOUT
-BUGWK66577 LEOPARD : fast/events/touch/tap-highlight-color.html = TIMEOUT
-
 BUGV8_1634 : fast/js/const.html = TEXT
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-18  Johnny Ding  <jnd@chromium.org>
+
+        Implement NSProcessInfo::systemUptime on Mac Leopard.
+        https://bugs.webkit.org/show_bug.cgi?id=66577
+
+        Reviewed by Tony Chang.
+
+        * WebCore.gyp/WebCore.gyp:
+        * platform/chromium/ScrollAnimatorChromiumMac.mm:
+        (-[NSProcessInfo systemUptime]):
+
 2011-10-18  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

@@ -1251 +1251 @@
                       'ChromiumWebCoreObjC|TCMVisibleView|RTCMFlippedView',
                   'category_whitelist_regex':
-                      'TCMInterposing',
+                      'TCMInterposing|ScrollAnimatorChromiumMacExt',
                 },
                 'action': [

trunk/Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm

@@ -26 +26 @@
 #include "config.h"
 
+#include <sys/time.h>
+#include <sys/sysctl.h>
+
 #include "ScrollAnimatorChromiumMac.h"
 
@@ -47 +50 @@
 @end
 
-@interface NSProcessInfo (NSObject)
+@interface NSProcessInfo (ScrollAnimatorChromiumMacExt)
 - (NSTimeInterval)systemUptime;
+@end
+
+@implementation NSProcessInfo (ScrollAnimatorChromiumMacExt)
+- (NSTimeInterval)systemUptime
+{
+    // Get how long system has been up. Found by looking getting "boottime" from the kernel.
+    static struct timeval boottime = {0};
+    if (!boottime.tv_sec) {
+        int mib[2] = {CTL_KERN, KERN_BOOTTIME};
+        size_t size = sizeof(boottime);
+        if (-1 == sysctl(mib, 2, &boottime, &size, 0, 0))
+            boottime.tv_sec = 0;
+    }
+    struct timeval now;
+    if (boottime.tv_sec && -1 != gettimeofday(&now, 0)) {
+        struct timeval uptime;
+        timersub(&now, &boottime, &uptime);
+        NSTimeInterval result = uptime.tv_sec + (uptime.tv_usec / 1E+6);
+        return result;
+    }
+    return 0;
+}
 @end
 #endif