Changeset 71602 in webkit

Timestamp:

Nov 8, 2010 8:14:36 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-11-08 John Knottenbelt <​jknotten@chromium.org>

Reviewed by Steve Block.

Convert to and from DOMTimeStamp with converter functions.
This is a refactoring only, covered by existing layout tests.
​https://bugs.webkit.org/show_bug.cgi?id=49066

• GNUmakefile.am:
• WebCore.gypi:
• WebCore.pro:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• dom/DOMTimeStamp.h: Added. (WebCore::convertSecondsToDOMTimeStamp): (WebCore::convertDOMTimeStampToSeconds):
• dom/Event.cpp: (WebCore::Event::Event):
• dom/Event.h:
• page/Geolocation.cpp: (WebCore::Geolocation::haveSuitableCachedPosition):
• platform/android/GeolocationServiceAndroid.cpp: (WebCore::GeolocationServiceAndroid::isPositionMoreTimely):

2010-11-08 John Knottenbelt <​jknotten@chromium.org>

Reviewed by Steve Block.

Convert to and from DOMTimeStamp with converter functions
​https://bugs.webkit.org/show_bug.cgi?id=49066

• src/WebDataSourceImpl.cpp: (WebKit::WebDataSourceImpl::triggeringEventTime):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.am (modified) (1 diff)
• WebCore/WebCore.gypi (modified) (1 diff)
• WebCore/WebCore.pro (modified) (1 diff)
• WebCore/WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• WebCore/dom/DOMTimeStamp.h (added)
• WebCore/dom/Event.cpp (modified) (2 diffs)
• WebCore/dom/Event.h (modified) (2 diffs)
• WebCore/page/Geolocation.cpp (modified) (1 diff)
• WebCore/platform/android/GeolocationServiceAndroid.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebDataSourceImpl.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-08  John Knottenbelt  <jknotten@chromium.org>
+
+        Reviewed by Steve Block.
+
+        Convert to and from DOMTimeStamp with converter functions.
+        This is a refactoring only, covered by existing layout tests.
+        https://bugs.webkit.org/show_bug.cgi?id=49066 
+
+        * GNUmakefile.am:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * dom/DOMTimeStamp.h: Added.
+        (WebCore::convertSecondsToDOMTimeStamp):
+        (WebCore::convertDOMTimeStampToSeconds):
+        * dom/Event.cpp:
+        (WebCore::Event::Event):
+        * dom/Event.h:
+        * page/Geolocation.cpp:
+        (WebCore::Geolocation::haveSuitableCachedPosition):
+        * platform/android/GeolocationServiceAndroid.cpp:
+        (WebCore::GeolocationServiceAndroid::isPositionMoreTimely):
+
 2010-11-08  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/WebCore/GNUmakefile.am

@@ -1122 +1122 @@
         WebCore/dom/DOMStringMap.cpp \
         WebCore/dom/DOMStringMap.h \
+        WebCore/dom/DOMTimeStamp.h \
         WebCore/dom/DynamicNodeList.cpp \
         WebCore/dom/DynamicNodeList.h \

trunk/WebCore/WebCore.gypi

@@ -1158 +1158 @@
             'dom/DOMStringMap.cpp',
             'dom/DOMStringMap.h',
+            'dom/DOMTimeStamp.h',
             'dom/DatasetDOMStringMap.cpp',
             'dom/DatasetDOMStringMap.h',

trunk/WebCore/WebCore.pro

@@ -1623 +1623 @@
     dom/DOMStringList.h \
     dom/DOMStringMap.h \
+    dom/DOMTimeStamp.h \
     dom/DatasetDOMStringMap.h \
     dom/DynamicNodeList.h \

trunk/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -41933 +41933 @@
                         </File>
                         <File
+                                RelativePath="..\dom\DOMTimeStamp.h"
+                                >
+                        </File>
+                                <File
                                 RelativePath="..\dom\DynamicNodeList.cpp"
                                 >

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -37 +37 @@
                 0014628B103CD1DE000B20DB /* OriginAccessEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = 00146289103CD1DE000B20DB /* OriginAccessEntry.h */; };
                 003F1FEA11E6AB43008258D9 /* UserContentTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 003F1FE911E6AB43008258D9 /* UserContentTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                05FD69E012845D4300B2BEB3 /* DOMTimeStamp.h in Headers */ = {isa = PBXBuildFile; fileRef = 05FD69DF12845D4300B2BEB3 /* DOMTimeStamp.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 06027CAD0B1CBFC000884B2D /* ContextMenuItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 06027CAC0B1CBFC000884B2D /* ContextMenuItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 06027CB30B1CC03D00884B2D /* ContextMenuItemMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 06027CB20B1CC03D00884B2D /* ContextMenuItemMac.mm */; };
@@ -6080 +6081 @@
                 00146289103CD1DE000B20DB /* OriginAccessEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OriginAccessEntry.h; sourceTree = "<group>"; };
                 003F1FE911E6AB43008258D9 /* UserContentTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserContentTypes.h; sourceTree = "<group>"; };
+                05FD69DF12845D4300B2BEB3 /* DOMTimeStamp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMTimeStamp.h; sourceTree = "<group>"; };
                 06027CAC0B1CBFC000884B2D /* ContextMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ContextMenuItem.h; sourceTree = "<group>"; };
                 06027CB20B1CC03D00884B2D /* ContextMenuItemMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ContextMenuItemMac.mm; sourceTree = "<group>"; };
@@ -18222 +18224 @@
                                 BC64640811D7F304006455B0 /* DOMStringMap.h */,
                                 BC64647911D800CD006455B0 /* DOMStringMap.idl */,
+                                05FD69DF12845D4300B2BEB3 /* DOMTimeStamp.h */,
                                 BC7FA61E0D1F0CBD00DB22A9 /* DynamicNodeList.cpp */,
                                 BC7FA61F0D1F0CBD00DB22A9 /* DynamicNodeList.h */,
@@ -19501 +19504 @@
                                 85E711D90AC5D5350053270F /* DOMTextInternal.h in Headers */,
                                 188604B40F2E654A000B6443 /* DOMTimer.h in Headers */,
+                                05FD69E012845D4300B2BEB3 /* DOMTimeStamp.h in Headers */,
                                 76FC2B0C12370DA0006A991A /* DOMTokenList.h in Headers */,
                                 BC1A37BE097C715F0019F3D8 /* DOMTraversal.h in Headers */,

trunk/WebCore/dom/Event.cpp

@@ -40 +40 @@
     , m_eventPhase(0)
     , m_currentTarget(0)
-    , m_createTime(static_cast<DOMTimeStamp>(currentTime() * 1000.0))
+    , m_createTime(convertSecondsToDOMTimeStamp(currentTime()))
 {
 }
@@ -55 +55 @@
     , m_eventPhase(0)
     , m_currentTarget(0)
-    , m_createTime(static_cast<DOMTimeStamp>(currentTime() * 1000.0))
+    , m_createTime(convertSecondsToDOMTimeStamp(currentTime()))
 {
 }

trunk/WebCore/dom/Event.h

@@ -25 +25 @@
 #define Event_h
 
+#include "DOMTimeStamp.h"
 #include "EventTarget.h"
 #include <wtf/RefCounted.h>
@@ -32 +33 @@
 
     class Clipboard;
-
-    // FIXME: this should probably defined elsewhere.
-    typedef unsigned long long DOMTimeStamp;
 
     class Event : public RefCounted<Event> {

trunk/WebCore/page/Geolocation.cpp

@@ -391 +391 @@
     if (!options->maximumAge())
         return false;
-    DOMTimeStamp currentTimeMillis = currentTime() * 1000.0;
+    DOMTimeStamp currentTimeMillis = convertSecondsToDOMTimeStamp(currentTime());
     return m_positionCache->cachedPosition()->timestamp() > currentTimeMillis - options->maximumAge();
 }

trunk/WebCore/platform/android/GeolocationServiceAndroid.cpp

@@ -172 +172 @@
 {
     ASSERT(position1 && position2);
-    DOMTimeStamp currentTimeMillis = WTF::currentTime() * 1000.0;
-    DOMTimeStamp maximumAgeMillis = 10 * 60 * 1000;  // 10 minutes
-    return currentTimeMillis - position1->timestamp() > maximumAgeMillis;
+    DOMTimeStamp currentTime = convertSecondsToDOMTimeStamp(WTF::currentTime());
+    DOMTimeStamp maximumAge = convertSecondsToDOMTimeStamp(10 * 60); // 10 minutes
+    return currentTime - position1->timestamp() > maximumAge;
 }
 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-11-08  John Knottenbelt  <jknotten@chromium.org>
+
+        Reviewed by Steve Block.
+
+        Convert to and from DOMTimeStamp with converter functions
+        https://bugs.webkit.org/show_bug.cgi?id=49066
+
+        * src/WebDataSourceImpl.cpp:
+        (WebKit::WebDataSourceImpl::triggeringEventTime):
+
+
 2010-11-08  Pierre-Antoine LaFayette  <pierre.lafayette@gmail.com>
 

trunk/WebKit/chromium/src/WebDataSourceImpl.cpp

@@ -97 +97 @@
 
     // DOMTimeStamp uses units of milliseconds.
-    return triggeringAction().event()->timeStamp() / 1000.0;
+    return convertDOMTimeStampToSeconds(triggeringAction().event()->timeStamp());
 }