2008-02-29 Mark Rowe <mrowe@apple.com>
authormrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Feb 2008 09:05:03 +0000 (09:05 +0000)
committermrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Feb 2008 09:05:03 +0000 (09:05 +0000)
        Reviewed by Oliver Hunt and Oliver Hunt.

        <rdar://problem/4753845> WebKit should use CGEventSourceSecondsSinceLastEventType in place of WKSecondsSinceLastInputEvent SPI.

        * platform/mac/SystemTimeMac.cpp:  Replace use of WKSecondsSinceLastInputEvent with CGEventSourceSecondsSinceLastEventType.
        * platform/mac/WebCoreSystemInterface.h:  Remove unused symbol.
        * platform/mac/WebCoreSystemInterface.mm:  Ditto.
        * WebCore.base.exp:  Ditto.

2008-02-29  Mark Rowe  <mrowe@apple.com>

        Reviewed by Oliver Hunt and Oliver Hunt.

        <rdar://problem/4753845> WebKit should use CGEventSourceSecondsSinceLastEventType in place of WKSecondsSinceLastInputEvent SPI.

        * WebCoreSupport/WebSystemInterface.m:
        (InitWebCoreSystemInterface):  Remove unused symbol.
        * WebKit.order:  Ditto.

2008-02-29  Mark Rowe  <mrowe@apple.com>

        Reviewed by Oliver Hunt and Oliver Hunt.

        <rdar://problem/4753845> WebKit should use CGEventSourceSecondsSinceLastEventType in place of WKSecondsSinceLastInputEvent SPI.

        * WebKitSystemInterface.h:  Remove unused symbol.
        * libWebKitSystemInterfaceLeopard.a:
        * libWebKitSystemInterfaceTiger.a:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30658 268f45cc-cd09-0410-ab3c-d52691b4dbfc

12 files changed:
WebCore/ChangeLog
WebCore/WebCore.base.exp
WebCore/platform/mac/SystemTimeMac.cpp
WebCore/platform/mac/WebCoreSystemInterface.h
WebCore/platform/mac/WebCoreSystemInterface.mm
WebKit/mac/ChangeLog
WebKit/mac/WebCoreSupport/WebSystemInterface.m
WebKit/mac/WebKit.order
WebKitLibraries/ChangeLog
WebKitLibraries/WebKitSystemInterface.h
WebKitLibraries/libWebKitSystemInterfaceLeopard.a
WebKitLibraries/libWebKitSystemInterfaceTiger.a

index 0ff33082e6a9788d6ff0bcaf8ab02f41898b5d0a..62766805f7ba1899d791db769d4eab4b89e6bb0b 100644 (file)
@@ -1,3 +1,14 @@
+2008-02-29  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Oliver Hunt and Oliver Hunt.
+
+        <rdar://problem/4753845> WebKit should use CGEventSourceSecondsSinceLastEventType in place of WKSecondsSinceLastInputEvent SPI.
+
+        * platform/mac/SystemTimeMac.cpp:  Replace use of WKSecondsSinceLastInputEvent with CGEventSourceSecondsSinceLastEventType.
+        * platform/mac/WebCoreSystemInterface.h:  Remove unused symbol.
+        * platform/mac/WebCoreSystemInterface.mm:  Ditto.
+        * WebCore.base.exp:  Ditto.
+
 2008-02-28  Mark Rowe  <mrowe@apple.com>
 
         Reviewed by Dave Hyatt.
index 36c43bb67122479ba03a4c5e57f3ba026b11872a..ff15e5e15b53087e8de63d7b5ac53c46ae5edfc6 100644 (file)
@@ -738,7 +738,6 @@ _wkQTMovieDataRate
 _wkQTMovieMaxTimeLoaded
 _wkQTMovieViewSetDrawSynchronously
 _wkReleaseStyleGroup
-_wkSecondsSinceLastInputEvent
 _wkSetCGFontRenderingMode
 _wkSetDragImage
 _wkSetNSURLConnectionDefersCallbacks
index a541b1d36ca040296e8c26d1dd8761e83540e1dc..dd5e500d0fa1fb70fec89f721c3e4c836ae00213 100644 (file)
@@ -26,8 +26,7 @@
 #include "config.h"
 #include "SystemTime.h"
 
-#include "WebCoreSystemInterface.h"
-
+#include <CoreGraphics/CGEventSource.h>
 #include <CoreFoundation/CFDate.h>
 
 namespace WebCore {
@@ -39,7 +38,7 @@ double currentTime()
 
 float userIdleTime()
 {
-    return wkSecondsSinceLastInputEvent();
+    return static_cast<float>(CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateCombinedSessionState, kCGAnyInputEventType));
 }
 
 }
index 211ee263101a2bd9571ee72008e6f746a3ce1a78..80321d43f8663577177b5531c6a0aea567936fba 100644 (file)
@@ -137,7 +137,6 @@ extern void (*wkSignalCFReadStreamEnd)(CFReadStreamRef stream);
 extern void (*wkSignalCFReadStreamError)(CFReadStreamRef stream, CFStreamError *error);
 extern void (*wkSignalCFReadStreamHasBytes)(CFReadStreamRef stream);
 extern BOOL (*wkSupportsMultipartXMixedReplace)(NSMutableURLRequest *);
-extern float (*wkSecondsSinceLastInputEvent)(void);
 
 #ifdef BUILDING_ON_TIGER
 extern void (*wkGetFontMetrics)(CGFontRef, int* ascent, int* descent, int* lineGap, unsigned* unitsPerEm);
index 15c5865f053d53e95488933eef0bae544ad44038..bd223c74270f27e12836780aa37db171ca382f32 100644 (file)
@@ -90,7 +90,6 @@ void (*wkSetNSURLConnectionDefersCallbacks)(NSURLConnection *, BOOL);
 void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
 id (*wkCreateNSURLConnectionDelegateProxy)(void);
 BOOL (*wkSupportsMultipartXMixedReplace)(NSMutableURLRequest *);
-float (*wkSecondsSinceLastInputEvent)(void);
 
 #ifdef BUILDING_ON_TIGER
 void (*wkGetFontMetrics)(CGFontRef, int* ascent, int* descent, int* lineGap, unsigned* unitsPerEm);
index 503ec3826c7633543d9079d8cebecc7cc52a26b7..9a5cb72d5b1855122201bdb07cbbc755d3bc15f6 100644 (file)
@@ -1,3 +1,13 @@
+2008-02-29  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Oliver Hunt and Oliver Hunt.
+
+        <rdar://problem/4753845> WebKit should use CGEventSourceSecondsSinceLastEventType in place of WKSecondsSinceLastInputEvent SPI.
+
+        * WebCoreSupport/WebSystemInterface.m:
+        (InitWebCoreSystemInterface):  Remove unused symbol.
+        * WebKit.order:  Ditto.
+
 2008-02-28  Mark Rowe  <mrowe@apple.com>
 
         Reviewed by Dave Hyatt.
index 7bf92804189da71e01e13b58569a13f9811214ed..382c4eafed650b12ce3756b5bee9593a6650696a 100644 (file)
@@ -77,7 +77,6 @@ void InitWebCoreSystemInterface(void)
     INIT(PathFromFont);
     INIT(PopupMenu);
     INIT(ReleaseStyleGroup);
-    INIT(SecondsSinceLastInputEvent);
     INIT(SetCGFontRenderingMode);
     INIT(SetDragImage);
     INIT(SetNSURLConnectionDefersCallbacks);
index 0de945ad49c902a0b8ec3d19cb17dd86754a520b..f9e32d45a7f64c1670538b73bb6d62ead58fffe9 100644 (file)
@@ -955,7 +955,6 @@ _WKPopupMenu
 _WKAccessibilityHandleFocusChanged
 -[WebViewFactory unregisterUniqueIdForUIElement:]
 _WKUnregisterUniqueIdForElement
-_WKSecondsSinceLastInputEvent
 __ZN25WebCachedPagePlatformData5clearEv
 -[WebHTMLView(WebInternal) closeIfNotCurrentView]
 _WKGetFontInLanguageForCharacter
index 321a7d4f111ac208b243cd91f7ce3ea9551fc588..04a38703b447ae3216fe4643f532a91080360b96 100644 (file)
@@ -1,3 +1,13 @@
+2008-02-29  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Oliver Hunt and Oliver Hunt.
+
+        <rdar://problem/4753845> WebKit should use CGEventSourceSecondsSinceLastEventType in place of WKSecondsSinceLastInputEvent SPI.
+
+        * WebKitSystemInterface.h:  Remove unused symbol.
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
 2008-02-28  Mark Rowe  <mrowe@apple.com>
 
         Reviewed by Dan Bernstein.
index 625e51e423050d33f2abc7489444b092142d9bae..c82944a4dc4d435a6018b493d9a170669727cbb8 100644 (file)
@@ -34,8 +34,6 @@ NSTimeInterval WKGetNSURLResponseFreshnessLifetime(NSURLResponse *response);
 
 CFStringEncoding WKGetWebDefaultCFStringEncoding(void);
 
-float WKSecondsSinceLastInputEvent(void);
-
 void WKSetMetadataURL(NSString *URLString, NSString *referrer, NSString *path);
 void WKSetNSURLConnectionDefersCallbacks(NSURLConnection *connection, BOOL defers);
 
index addcdec4903ef04f8b79fd9fc1ad7cbb551975ed..bfdef8182371fe8d6e59f37af810006e7828bd88 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ
index e1911a24fa6dc72eaea93d3f2c17e29e2e82c5fb..a7f40fec3b875d8cd98c834773bdfc03c4526761 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceTiger.a and b/WebKitLibraries/libWebKitSystemInterfaceTiger.a differ