Diff
Modified: trunk/Source/WebCore/ChangeLog (283911 => 283912)
--- trunk/Source/WebCore/ChangeLog 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/ChangeLog 2021-10-11 18:05:45 UTC (rev 283912)
@@ -1,3 +1,48 @@
+2021-10-11 Chris Dumez <[email protected]>
+
+ DOMTimeStamp is now EpochTimeStamp
+ https://bugs.webkit.org/show_bug.cgi?id=231496
+
+ Reviewed by Sam Weinig.
+
+ DOMTimeStamp was renamed EpochTimeStamp. There is no observable behavioral change - it's just a name change.
+
+ Relevant WebIDL discussions/issue:
+ - https://github.com/whatwg/webidl/issues/2
+
+ Which lead to:
+ - https://github.com/w3c/hr-time/pull/124
+
+ * Headers.cmake:
+ * Modules/geolocation/Geolocation.cpp:
+ (WebCore::createGeolocationPosition):
+ (WebCore::Geolocation::haveSuitableCachedPosition):
+ * Modules/geolocation/GeolocationPosition.h:
+ (WebCore::GeolocationPosition::create):
+ (WebCore::GeolocationPosition::timestamp const):
+ (WebCore::GeolocationPosition::GeolocationPosition):
+ * Modules/geolocation/GeolocationPosition.idl:
+ * Modules/notifications/Notification.idl:
+ * Modules/push-api/PushSubscription.cpp:
+ (WebCore::PushSubscription::PushSubscription):
+ (WebCore::PushSubscription::expirationTime const):
+ * Modules/push-api/PushSubscription.h:
+ * Modules/push-api/PushSubscription.idl:
+ * Modules/push-api/PushSubscriptionJSON.h:
+ * Modules/push-api/PushSubscriptionJSON.idl:
+ * Modules/push-api/PushSubscriptionOptions.h:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/scripts/IDLParser.pm:
+ (addBuiltinTypedefs):
+ * bindings/scripts/test/TestTypedefs.idl:
+ * dom/EpochTimeStamp.h: Renamed from Source/WebCore/dom/DOMTimeStamp.h.
+ (WebCore::convertSecondsToEpochTimeStamp):
+ (WebCore::convertEpochTimeStampToSeconds):
+ * testing/Internals.cpp:
+ (WebCore::Internals::createPushSubscription):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
2021-10-11 Simon Fraser <[email protected]>
Smooth-scroll animations should run in the UI process on iOS
Modified: trunk/Source/WebCore/Headers.cmake (283911 => 283912)
--- trunk/Source/WebCore/Headers.cmake 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/Headers.cmake 2021-10-11 18:05:45 UTC (rev 283912)
@@ -467,7 +467,6 @@
dom/DOMRectInit.h
dom/DOMRectList.h
dom/DOMRectReadOnly.h
- dom/DOMTimeStamp.h
dom/DataTransfer.h
dom/DeviceOrientationClient.h
dom/DeviceOrientationData.h
@@ -491,6 +490,7 @@
dom/ElementIterator.h
dom/ElementIteratorAssertions.h
dom/ElementTraversal.h
+ dom/EpochTimeStamp.h
dom/Event.h
dom/EventInit.h
dom/EventListener.h
Modified: trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp (283911 => 283912)
--- trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp 2021-10-11 18:05:45 UTC (rev 283912)
@@ -62,7 +62,7 @@
if (!position)
return nullptr;
- DOMTimeStamp timestamp = convertSecondsToDOMTimeStamp(position->timestamp);
+ EpochTimeStamp timestamp = convertSecondsToEpochTimeStamp(position->timestamp);
return GeolocationPosition::create(GeolocationCoordinates::create(WTFMove(position.value())), timestamp);
}
@@ -479,7 +479,7 @@
return false;
if (!options.maximumAge)
return false;
- DOMTimeStamp currentTimeMillis = convertSecondsToDOMTimeStamp(WallTime::now().secondsSinceEpoch());
+ EpochTimeStamp currentTimeMillis = convertSecondsToEpochTimeStamp(WallTime::now().secondsSinceEpoch());
return cachedPosition->timestamp() > currentTimeMillis - options.maximumAge;
}
Modified: trunk/Source/WebCore/Modules/geolocation/GeolocationPosition.h (283911 => 283912)
--- trunk/Source/WebCore/Modules/geolocation/GeolocationPosition.h 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/Modules/geolocation/GeolocationPosition.h 2021-10-11 18:05:45 UTC (rev 283912)
@@ -25,7 +25,7 @@
#pragma once
-#include "DOMTimeStamp.h"
+#include "EpochTimeStamp.h"
#include "GeolocationCoordinates.h"
#include <wtf/RefCounted.h>
#include <wtf/text/WTFString.h>
@@ -34,7 +34,7 @@
class GeolocationPosition : public RefCounted<GeolocationPosition> {
public:
- static Ref<GeolocationPosition> create(Ref<GeolocationCoordinates>&& coordinates, DOMTimeStamp timestamp)
+ static Ref<GeolocationPosition> create(Ref<GeolocationCoordinates>&& coordinates, EpochTimeStamp timestamp)
{
return adoptRef(*new GeolocationPosition(WTFMove(coordinates), timestamp));
}
@@ -44,11 +44,11 @@
return create(m_coordinates->isolatedCopy(), m_timestamp);
}
- DOMTimeStamp timestamp() const { return m_timestamp; }
+ EpochTimeStamp timestamp() const { return m_timestamp; }
const GeolocationCoordinates& coords() const { return m_coordinates.get(); }
private:
- GeolocationPosition(Ref<GeolocationCoordinates>&& coordinates, DOMTimeStamp timestamp)
+ GeolocationPosition(Ref<GeolocationCoordinates>&& coordinates, EpochTimeStamp timestamp)
: m_coordinates(WTFMove(coordinates))
, m_timestamp(timestamp)
{
@@ -55,7 +55,7 @@
}
Ref<GeolocationCoordinates> m_coordinates;
- DOMTimeStamp m_timestamp;
+ EpochTimeStamp m_timestamp;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/geolocation/GeolocationPosition.idl (283911 => 283912)
--- trunk/Source/WebCore/Modules/geolocation/GeolocationPosition.idl 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/Modules/geolocation/GeolocationPosition.idl 2021-10-11 18:05:45 UTC (rev 283912)
@@ -31,5 +31,5 @@
Exposed=Window
] interface GeolocationPosition {
readonly attribute GeolocationCoordinates coords;
- readonly attribute DOMTimeStamp timestamp;
+ readonly attribute EpochTimeStamp timestamp;
};
Modified: trunk/Source/WebCore/Modules/notifications/Notification.idl (283911 => 283912)
--- trunk/Source/WebCore/Modules/notifications/Notification.idl 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/Modules/notifications/Notification.idl 2021-10-11 18:05:45 UTC (rev 283912)
@@ -57,7 +57,7 @@
// readonly attribute USVString badge;
// readonly attribute USVString sound;
// [SameObject] readonly attribute FrozenArray<unsigned long> vibrate;
- // readonly attribute DOMTimeStamp timestamp;
+ // readonly attribute EpochTimeStamp timestamp;
// readonly attribute boolean renotify;
// readonly attribute boolean silent;
// readonly attribute boolean requireInteraction;
@@ -86,7 +86,7 @@
// USVString badge;
// USVString sound;
// VibratePattern vibrate;
- // DOMTimeStamp timestamp;
+ // EpochTimeStamp timestamp;
// boolean renotify = false;
// boolean silent = false;
// boolean requireInteraction = false;
Modified: trunk/Source/WebCore/Modules/push-api/PushSubscription.cpp (283911 => 283912)
--- trunk/Source/WebCore/Modules/push-api/PushSubscription.cpp 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/Modules/push-api/PushSubscription.cpp 2021-10-11 18:05:45 UTC (rev 283912)
@@ -37,7 +37,7 @@
WTF_MAKE_ISO_ALLOCATED_IMPL(PushSubscription);
-PushSubscription::PushSubscription(String&& endpoint, std::optional<DOMTimeStamp> expirationTime, Ref<PushSubscriptionOptions>&& options, Vector<uint8_t>&& clientECDHPublicKey, Vector<uint8_t>&& sharedAuthenticationSecret)
+PushSubscription::PushSubscription(String&& endpoint, std::optional<EpochTimeStamp> expirationTime, Ref<PushSubscriptionOptions>&& options, Vector<uint8_t>&& clientECDHPublicKey, Vector<uint8_t>&& sharedAuthenticationSecret)
: m_endpoint(WTFMove(endpoint))
, m_expirationTime(expirationTime)
, m_options(WTFMove(options))
@@ -53,7 +53,7 @@
return m_endpoint;
}
-std::optional<DOMTimeStamp> PushSubscription::expirationTime() const
+std::optional<EpochTimeStamp> PushSubscription::expirationTime() const
{
return m_expirationTime;
}
Modified: trunk/Source/WebCore/Modules/push-api/PushSubscription.h (283911 => 283912)
--- trunk/Source/WebCore/Modules/push-api/PushSubscription.h 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/Modules/push-api/PushSubscription.h 2021-10-11 18:05:45 UTC (rev 283912)
@@ -27,7 +27,7 @@
#if ENABLE(SERVICE_WORKER)
-#include "DOMTimeStamp.h"
+#include "EpochTimeStamp.h"
#include "ExceptionOr.h"
#include "JSDOMPromiseDeferred.h"
#include "PushEncryptionKeyName.h"
@@ -49,7 +49,7 @@
WEBCORE_EXPORT ~PushSubscription();
const String& endpoint() const;
- std::optional<DOMTimeStamp> expirationTime() const;
+ std::optional<EpochTimeStamp> expirationTime() const;
PushSubscriptionOptions& options() const;
ExceptionOr<RefPtr<JSC::ArrayBuffer>> getKey(PushEncryptionKeyName) const;
void unsubscribe(DOMPromiseDeferred<IDLBoolean>&&);
@@ -57,10 +57,10 @@
PushSubscriptionJSON toJSON() const;
private:
- WEBCORE_EXPORT PushSubscription(String&& endpoint, std::optional<DOMTimeStamp> expirationTime, Ref<PushSubscriptionOptions>&&, Vector<uint8_t>&& clientECDHPublicKey, Vector<uint8_t>&& auth);
+ WEBCORE_EXPORT PushSubscription(String&& endpoint, std::optional<EpochTimeStamp> expirationTime, Ref<PushSubscriptionOptions>&&, Vector<uint8_t>&& clientECDHPublicKey, Vector<uint8_t>&& auth);
String m_endpoint;
- std::optional<DOMTimeStamp> m_expirationTime;
+ std::optional<EpochTimeStamp> m_expirationTime;
Ref<PushSubscriptionOptions> m_options;
Vector<uint8_t> m_clientECDHPublicKey;
Vector<uint8_t> m_sharedAuthenticationSecret;
Modified: trunk/Source/WebCore/Modules/push-api/PushSubscription.idl (283911 => 283912)
--- trunk/Source/WebCore/Modules/push-api/PushSubscription.idl 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/Modules/push-api/PushSubscription.idl 2021-10-11 18:05:45 UTC (rev 283912)
@@ -34,7 +34,7 @@
Exposed=(Window,Worker),
] interface PushSubscription {
readonly attribute USVString endpoint;
- readonly attribute DOMTimeStamp? expirationTime;
+ readonly attribute EpochTimeStamp? expirationTime;
[SameObject] readonly attribute PushSubscriptionOptions options;
ArrayBuffer? getKey(PushEncryptionKeyName name);
Promise<boolean> unsubscribe();
Modified: trunk/Source/WebCore/Modules/push-api/PushSubscriptionJSON.h (283911 => 283912)
--- trunk/Source/WebCore/Modules/push-api/PushSubscriptionJSON.h 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/Modules/push-api/PushSubscriptionJSON.h 2021-10-11 18:05:45 UTC (rev 283912)
@@ -27,7 +27,7 @@
#if ENABLE(SERVICE_WORKER)
-#include "DOMTimeStamp.h"
+#include "EpochTimeStamp.h"
#include <optional>
#include <wtf/KeyValuePair.h>
@@ -37,7 +37,7 @@
struct PushSubscriptionJSON {
String endpoint;
- std::optional<DOMTimeStamp> expirationTime;
+ std::optional<EpochTimeStamp> expirationTime;
Vector<WTF::KeyValuePair<String, String>> keys;
};
Modified: trunk/Source/WebCore/Modules/push-api/PushSubscriptionJSON.idl (283911 => 283912)
--- trunk/Source/WebCore/Modules/push-api/PushSubscriptionJSON.idl 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/Modules/push-api/PushSubscriptionJSON.idl 2021-10-11 18:05:45 UTC (rev 283912)
@@ -30,6 +30,6 @@
JSGenerateToJSObject,
] dictionary PushSubscriptionJSON {
USVString endpoint;
- DOMTimeStamp? expirationTime;
+ EpochTimeStamp? expirationTime;
record<DOMString, USVString> keys;
};
Modified: trunk/Source/WebCore/Modules/push-api/PushSubscriptionOptions.h (283911 => 283912)
--- trunk/Source/WebCore/Modules/push-api/PushSubscriptionOptions.h 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/Modules/push-api/PushSubscriptionOptions.h 2021-10-11 18:05:45 UTC (rev 283912)
@@ -27,7 +27,7 @@
#if ENABLE(SERVICE_WORKER)
-#include "DOMTimeStamp.h"
+#include "EpochTimeStamp.h"
#include "ExceptionOr.h"
#include <_javascript_Core/ArrayBuffer.h>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (283911 => 283912)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-10-11 18:05:45 UTC (rev 283912)
@@ -67,7 +67,7 @@
01D3CF8714BD0A3000FE9970 /* WebGLSharedObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 01D3CF8114BD0A3000FE9970 /* WebGLSharedObject.h */; };
0562F9611573F88F0031CA16 /* PlatformLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0562F9601573F88F0031CA16 /* PlatformLayer.h */; settings = {ATTRIBUTES = (Private, ); }; };
056A7AC8256C4F48002F9DDC /* ShadowRootInit.h in Headers */ = {isa = PBXBuildFile; fileRef = 054E3A33256C3BD90072C5B9 /* ShadowRootInit.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 05FD69E012845D4300B2BEB3 /* DOMTimeStamp.h in Headers */ = {isa = PBXBuildFile; fileRef = 05FD69DF12845D4300B2BEB3 /* DOMTimeStamp.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 05FD69E012845D4300B2BEB3 /* EpochTimeStamp.h in Headers */ = {isa = PBXBuildFile; fileRef = 05FD69DF12845D4300B2BEB3 /* EpochTimeStamp.h */; settings = {ATTRIBUTES = (Private, ); }; };
06027CAD0B1CBFC000884B2D /* ContextMenuItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 06027CAC0B1CBFC000884B2D /* ContextMenuItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
062287840B4DB322000C34DF /* FocusDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 062287830B4DB322000C34DF /* FocusDirection.h */; settings = {ATTRIBUTES = (Private, ); }; };
065AD4F50B0C2EDA005A2B1D /* ContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 065AD4F20B0C2EDA005A2B1D /* ContextMenuClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -5787,7 +5787,7 @@
054E3A33256C3BD90072C5B9 /* ShadowRootInit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShadowRootInit.h; sourceTree = "<group>"; };
054E3A35256C3BD90072C5B9 /* ShadowRootInit.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = ShadowRootInit.idl; sourceTree = "<group>"; };
0562F9601573F88F0031CA16 /* PlatformLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformLayer.h; sourceTree = "<group>"; };
- 05FD69DF12845D4300B2BEB3 /* DOMTimeStamp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMTimeStamp.h; sourceTree = "<group>"; };
+ 05FD69DF12845D4300B2BEB3 /* EpochTimeStamp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EpochTimeStamp.h; sourceTree = "<group>"; };
06027CAC0B1CBFC000884B2D /* ContextMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ContextMenuItem.h; sourceTree = "<group>"; };
062287830B4DB322000C34DF /* FocusDirection.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FocusDirection.h; sourceTree = "<group>"; };
065AD4F20B0C2EDA005A2B1D /* ContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ContextMenuClient.h; sourceTree = "<group>"; };
@@ -30579,7 +30579,6 @@
C544274A11A57E7A0063A749 /* DOMStringList.idl */,
BC64640811D7F304006455B0 /* DOMStringMap.h */,
BC64647911D800CD006455B0 /* DOMStringMap.idl */,
- 05FD69DF12845D4300B2BEB3 /* DOMTimeStamp.h */,
46E0C0DC23C006B4005E47AE /* DragEvent.cpp */,
46E0C0DA23C006B3005E47AE /* DragEvent.h */,
46E0C0DD23C006B4005E47AE /* DragEvent.idl */,
@@ -30606,6 +30605,7 @@
637B7ADE0E8767B800E32194 /* ElementRareData.h */,
E4D58EBA17B8F12800CBDCA8 /* ElementTraversal.h */,
93849C1E24BE404A00448D5A /* EmptyScriptExecutionContext.h */,
+ 05FD69DF12845D4300B2BEB3 /* EpochTimeStamp.h */,
2ECF7ADE10162B5800427DE7 /* ErrorEvent.cpp */,
2ECF7ADF10162B5800427DE7 /* ErrorEvent.h */,
2ECF7AE010162B5800427DE7 /* ErrorEvent.idl */,
@@ -32516,7 +32516,6 @@
BC64640A11D7F304006455B0 /* DOMStringMap.h in Headers */,
188604B40F2E654A000B6443 /* DOMTimer.h in Headers */,
CE1A501F22D5350900CBC927 /* DOMTimerHoldingTank.h in Headers */,
- 05FD69E012845D4300B2BEB3 /* DOMTimeStamp.h in Headers */,
76FC2B0C12370DA0006A991A /* DOMTokenList.h in Headers */,
2E37DFDB12DBAFB800A6B233 /* DOMURL.h in Headers */,
CD9DE18217AAD6A400EA386D /* DOMURLMediaSource.h in Headers */,
@@ -32581,6 +32580,7 @@
7C77C3D71DEF850A00A50BFA /* EndingType.h in Headers */,
F403E7872363B58C00044550 /* EnterKeyHint.h in Headers */,
1D2F8E042344751600993B68 /* EnterPictureInPictureEvent.h in Headers */,
+ 05FD69E012845D4300B2BEB3 /* EpochTimeStamp.h in Headers */,
FD31609312B026F700C1A359 /* EqualPowerPanner.h in Headers */,
8371AC3B1F509BE400FBF284 /* ErrorCallback.h in Headers */,
2ECF7AE210162B5800427DE7 /* ErrorEvent.h in Headers */,
Modified: trunk/Source/WebCore/bindings/scripts/IDLParser.pm (283911 => 283912)
--- trunk/Source/WebCore/bindings/scripts/IDLParser.pm 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/bindings/scripts/IDLParser.pm 2021-10-11 18:05:45 UTC (rev 283912)
@@ -597,10 +597,10 @@
push(@{$bufferSourceType->subtypes}, makeSimpleType("ArrayBuffer"));
$typedefs{"BufferSource"} = IDLTypedef->new(type => $bufferSourceType);
- # typedef unsigned long long DOMTimeStamp;
+ # typedef unsigned long long EpochTimeStamp;
- my $DOMTimeStampType = IDLType->new(name => "unsigned long long");
- $typedefs{"DOMTimeStamp"} = IDLTypedef->new(type => $DOMTimeStampType);
+ my $EpochTimeStampType = IDLType->new(name => "unsigned long long");
+ $typedefs{"EpochTimeStamp"} = IDLTypedef->new(type => $EpochTimeStampType);
}
my $nextOptionallyReadonlyAttribute_1 = '^(readonly|attribute)$';
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (283911 => 283912)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2021-10-11 18:05:45 UTC (rev 283912)
@@ -98,8 +98,8 @@
static JSC_DECLARE_CUSTOM_SETTER(setJSTestTypedefs_attributeWithClampInTypedef);
static JSC_DECLARE_CUSTOM_GETTER(jsTestTypedefs_bufferSourceAttr);
static JSC_DECLARE_CUSTOM_SETTER(setJSTestTypedefs_bufferSourceAttr);
-static JSC_DECLARE_CUSTOM_GETTER(jsTestTypedefs_domTimeStampAttr);
-static JSC_DECLARE_CUSTOM_SETTER(setJSTestTypedefs_domTimeStampAttr);
+static JSC_DECLARE_CUSTOM_GETTER(jsTestTypedefs_epochTimeStampAttr);
+static JSC_DECLARE_CUSTOM_SETTER(setJSTestTypedefs_epochTimeStampAttr);
class JSTestTypedefsPrototype final : public JSC::JSNonFinalObject {
public:
@@ -212,7 +212,7 @@
{ "attributeWithClamp", static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute), NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestTypedefs_attributeWithClamp), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestTypedefs_attributeWithClamp) } },
{ "attributeWithClampInTypedef", static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute), NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestTypedefs_attributeWithClampInTypedef), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestTypedefs_attributeWithClampInTypedef) } },
{ "bufferSourceAttr", static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute), NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestTypedefs_bufferSourceAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestTypedefs_bufferSourceAttr) } },
- { "domTimeStampAttr", static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute), NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestTypedefs_domTimeStampAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestTypedefs_domTimeStampAttr) } },
+ { "epochTimeStampAttr", static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute), NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestTypedefs_epochTimeStampAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestTypedefs_epochTimeStampAttr) } },
{ "func", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestTypedefsPrototypeFunction_func), (intptr_t) (0) } },
{ "setShadow", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestTypedefsPrototypeFunction_setShadow), (intptr_t) (3) } },
{ "methodWithSequenceArg", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestTypedefsPrototypeFunction_methodWithSequenceArg), (intptr_t) (1) } },
@@ -451,20 +451,20 @@
return IDLAttribute<JSTestTypedefs>::set<setJSTestTypedefs_bufferSourceAttrSetter>(*lexicalGlobalObject, thisValue, encodedValue, attributeName);
}
-static inline JSValue jsTestTypedefs_domTimeStampAttrGetter(JSGlobalObject& lexicalGlobalObject, JSTestTypedefs& thisObject)
+static inline JSValue jsTestTypedefs_epochTimeStampAttrGetter(JSGlobalObject& lexicalGlobalObject, JSTestTypedefs& thisObject)
{
auto& vm = JSC::getVM(&lexicalGlobalObject);
auto throwScope = DECLARE_THROW_SCOPE(vm);
auto& impl = thisObject.wrapped();
- RELEASE_AND_RETURN(throwScope, (toJS<IDLUnsignedLongLong>(lexicalGlobalObject, throwScope, impl.domTimeStampAttr())));
+ RELEASE_AND_RETURN(throwScope, (toJS<IDLUnsignedLongLong>(lexicalGlobalObject, throwScope, impl.epochTimeStampAttr())));
}
-JSC_DEFINE_CUSTOM_GETTER(jsTestTypedefs_domTimeStampAttr, (JSGlobalObject* lexicalGlobalObject, EncodedJSValue thisValue, PropertyName attributeName))
+JSC_DEFINE_CUSTOM_GETTER(jsTestTypedefs_epochTimeStampAttr, (JSGlobalObject* lexicalGlobalObject, EncodedJSValue thisValue, PropertyName attributeName))
{
- return IDLAttribute<JSTestTypedefs>::get<jsTestTypedefs_domTimeStampAttrGetter, CastedThisErrorBehavior::Assert>(*lexicalGlobalObject, thisValue, attributeName);
+ return IDLAttribute<JSTestTypedefs>::get<jsTestTypedefs_epochTimeStampAttrGetter, CastedThisErrorBehavior::Assert>(*lexicalGlobalObject, thisValue, attributeName);
}
-static inline bool setJSTestTypedefs_domTimeStampAttrSetter(JSGlobalObject& lexicalGlobalObject, JSTestTypedefs& thisObject, JSValue value)
+static inline bool setJSTestTypedefs_epochTimeStampAttrSetter(JSGlobalObject& lexicalGlobalObject, JSTestTypedefs& thisObject, JSValue value)
{
auto& vm = JSC::getVM(&lexicalGlobalObject);
auto throwScope = DECLARE_THROW_SCOPE(vm);
@@ -472,14 +472,14 @@
auto nativeValue = convert<IDLUnsignedLongLong>(lexicalGlobalObject, value);
RETURN_IF_EXCEPTION(throwScope, false);
invokeFunctorPropagatingExceptionIfNecessary(lexicalGlobalObject, throwScope, [&] {
- return impl.setDomTimeStampAttr(WTFMove(nativeValue));
+ return impl.setEpochTimeStampAttr(WTFMove(nativeValue));
});
return true;
}
-JSC_DEFINE_CUSTOM_SETTER(setJSTestTypedefs_domTimeStampAttr, (JSGlobalObject* lexicalGlobalObject, EncodedJSValue thisValue, EncodedJSValue encodedValue, PropertyName attributeName))
+JSC_DEFINE_CUSTOM_SETTER(setJSTestTypedefs_epochTimeStampAttr, (JSGlobalObject* lexicalGlobalObject, EncodedJSValue thisValue, EncodedJSValue encodedValue, PropertyName attributeName))
{
- return IDLAttribute<JSTestTypedefs>::set<setJSTestTypedefs_domTimeStampAttrSetter>(*lexicalGlobalObject, thisValue, encodedValue, attributeName);
+ return IDLAttribute<JSTestTypedefs>::set<setJSTestTypedefs_epochTimeStampAttrSetter>(*lexicalGlobalObject, thisValue, encodedValue, attributeName);
}
static inline JSC::EncodedJSValue jsTestTypedefsPrototypeFunction_funcBody(JSC::JSGlobalObject* lexicalGlobalObject, JSC::CallFrame* callFrame, typename IDLOperation<JSTestTypedefs>::ClassParameter castedThis)
Modified: trunk/Source/WebCore/bindings/scripts/test/TestTypedefs.idl (283911 => 283912)
--- trunk/Source/WebCore/bindings/scripts/test/TestTypedefs.idl 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/bindings/scripts/test/TestTypedefs.idl 2021-10-11 18:05:45 UTC (rev 283912)
@@ -70,7 +70,7 @@
// Builtin Typedefs
attribute BufferSource bufferSourceAttr;
- attribute DOMTimeStamp domTimeStampAttr;
+ attribute EpochTimeStamp epochTimeStampAttr;
};
typedef unrestricted float DOUBLE;
Deleted: trunk/Source/WebCore/dom/DOMTimeStamp.h (283911 => 283912)
--- trunk/Source/WebCore/dom/DOMTimeStamp.h 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/dom/DOMTimeStamp.h 2021-10-11 18:05:45 UTC (rev 283912)
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include <wtf/Seconds.h>
-
-namespace WebCore {
-
-typedef unsigned long long DOMTimeStamp;
-
-inline DOMTimeStamp convertSecondsToDOMTimeStamp(double seconds)
-{
- return static_cast<DOMTimeStamp>(seconds * 1000.0);
-}
-
-inline DOMTimeStamp convertSecondsToDOMTimeStamp(Seconds seconds)
-{
- return static_cast<DOMTimeStamp>(seconds.milliseconds());
-}
-
-inline double convertDOMTimeStampToSeconds(DOMTimeStamp milliseconds)
-{
- return milliseconds / 1000.0;
-}
-
-} // namespace WebCore
Copied: trunk/Source/WebCore/dom/EpochTimeStamp.h (from rev 283911, trunk/Source/WebCore/dom/DOMTimeStamp.h) (0 => 283912)
--- trunk/Source/WebCore/dom/EpochTimeStamp.h (rev 0)
+++ trunk/Source/WebCore/dom/EpochTimeStamp.h 2021-10-11 18:05:45 UTC (rev 283912)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <wtf/Seconds.h>
+
+namespace WebCore {
+
+typedef uint64_t EpochTimeStamp;
+
+inline EpochTimeStamp convertSecondsToEpochTimeStamp(double seconds)
+{
+ return static_cast<EpochTimeStamp>(seconds * 1000.0);
+}
+
+inline EpochTimeStamp convertSecondsToEpochTimeStamp(Seconds seconds)
+{
+ return static_cast<EpochTimeStamp>(seconds.milliseconds());
+}
+
+inline double convertEpochTimeStampToSeconds(EpochTimeStamp milliseconds)
+{
+ return milliseconds / 1000.0;
+}
+
+} // namespace WebCore
Modified: trunk/Source/WebCore/testing/Internals.cpp (283911 => 283912)
--- trunk/Source/WebCore/testing/Internals.cpp 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/testing/Internals.cpp 2021-10-11 18:05:45 UTC (rev 283912)
@@ -6539,7 +6539,7 @@
}
#if ENABLE(SERVICE_WORKER)
-RefPtr<PushSubscription> Internals::createPushSubscription(const String& endpoint, std::optional<DOMTimeStamp> expirationTime, bool userVisibleOnly, const ArrayBuffer& serverVAPIDPublicKey, const ArrayBuffer& clientECDHPublicKey, const ArrayBuffer& auth)
+RefPtr<PushSubscription> Internals::createPushSubscription(const String& endpoint, std::optional<EpochTimeStamp> expirationTime, bool userVisibleOnly, const ArrayBuffer& serverVAPIDPublicKey, const ArrayBuffer& clientECDHPublicKey, const ArrayBuffer& auth)
{
auto myEndpoint = endpoint;
Vector<uint8_t> myServerVAPIDPublicKey { static_cast<const uint8_t*>(serverVAPIDPublicKey.data()), serverVAPIDPublicKey.byteLength() };
Modified: trunk/Source/WebCore/testing/Internals.h (283911 => 283912)
--- trunk/Source/WebCore/testing/Internals.h 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/testing/Internals.h 2021-10-11 18:05:45 UTC (rev 283912)
@@ -29,7 +29,7 @@
#include "CSSComputedStyleDeclaration.h"
#include "ContextDestructionObserver.h"
#include "Cookie.h"
-#include "DOMTimeStamp.h"
+#include "EpochTimeStamp.h"
#include "ExceptionOr.h"
#include "HEVCUtilities.h"
#include "IDLTypes.h"
@@ -1199,7 +1199,7 @@
void retainTextIteratorForDocumentContent();
#if ENABLE(SERVICE_WORKER)
- RefPtr<PushSubscription> createPushSubscription(const String& endpoint, std::optional<DOMTimeStamp> expirationTime, bool userVisibleOnly, const ArrayBuffer& serverVAPIDPublicKey, const ArrayBuffer& clientECDHPublicKey, const ArrayBuffer& auth);
+ RefPtr<PushSubscription> createPushSubscription(const String& endpoint, std::optional<EpochTimeStamp> expirationTime, bool userVisibleOnly, const ArrayBuffer& serverVAPIDPublicKey, const ArrayBuffer& clientECDHPublicKey, const ArrayBuffer& auth);
#endif
private:
Modified: trunk/Source/WebCore/testing/Internals.idl (283911 => 283912)
--- trunk/Source/WebCore/testing/Internals.idl 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebCore/testing/Internals.idl 2021-10-11 18:05:45 UTC (rev 283912)
@@ -1066,5 +1066,5 @@
undefined retainTextIteratorForDocumentContent();
- [Conditional=SERVICE_WORKER] PushSubscription createPushSubscription(USVString endpoint, DOMTimeStamp? expirationTime, boolean userVisibleOnly, ArrayBuffer serverVAPIDPublicKey, ArrayBuffer clientECDHPublicKey, ArrayBuffer auth);
+ [Conditional=SERVICE_WORKER] PushSubscription createPushSubscription(USVString endpoint, EpochTimeStamp? expirationTime, boolean userVisibleOnly, ArrayBuffer serverVAPIDPublicKey, ArrayBuffer clientECDHPublicKey, ArrayBuffer auth);
};
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (283911 => 283912)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2021-10-11 18:05:45 UTC (rev 283912)
@@ -1,3 +1,15 @@
+2021-10-11 Chris Dumez <[email protected]>
+
+ DOMTimeStamp is now EpochTimeStamp
+ https://bugs.webkit.org/show_bug.cgi?id=231496
+
+ Reviewed by Sam Weinig.
+
+ * DOM/DOMEvent.h:
+ * DOM/DOMEvent.mm:
+ (-[DOMEvent timeStamp]):
+ * DOM/DOMObject.h:
+
2021-10-08 Jer Noble <[email protected]>
[Build-time perf] Forward-declare more things in Element.h
Modified: trunk/Source/WebKitLegacy/mac/DOM/DOMEvent.h (283911 => 283912)
--- trunk/Source/WebKitLegacy/mac/DOM/DOMEvent.h 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebKitLegacy/mac/DOM/DOMEvent.h 2021-10-11 18:05:45 UTC (rev 283912)
@@ -43,7 +43,7 @@
@property (readonly) unsigned short eventPhase;
@property (readonly) BOOL bubbles;
@property (readonly) BOOL cancelable;
-@property (readonly) DOMTimeStamp timeStamp;
+@property (readonly) EpochTimeStamp timeStamp;
@property (readonly, strong) id <DOMEventTarget> srcElement WEBKIT_AVAILABLE_MAC(10_6);
@property BOOL returnValue WEBKIT_AVAILABLE_MAC(10_6);
@property BOOL cancelBubble WEBKIT_AVAILABLE_MAC(10_6);
Modified: trunk/Source/WebKitLegacy/mac/DOM/DOMEvent.mm (283911 => 283912)
--- trunk/Source/WebKitLegacy/mac/DOM/DOMEvent.mm 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebKitLegacy/mac/DOM/DOMEvent.mm 2021-10-11 18:05:45 UTC (rev 283912)
@@ -94,7 +94,7 @@
return IMPL->composed();
}
-- (DOMTimeStamp)timeStamp
+- (EpochTimeStamp)timeStamp
{
WebCore::JSMainThreadNullState state;
return IMPL->timeStamp().approximateWallTime().secondsSinceEpoch().milliseconds();
Modified: trunk/Source/WebKitLegacy/mac/DOM/DOMObject.h (283911 => 283912)
--- trunk/Source/WebKitLegacy/mac/DOM/DOMObject.h 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebKitLegacy/mac/DOM/DOMObject.h 2021-10-11 18:05:45 UTC (rev 283912)
@@ -29,7 +29,7 @@
@class DOMStyleSheet;
-typedef unsigned long long DOMTimeStamp;
+typedef unsigned long long EpochTimeStamp;
typedef struct DOMObjectInternal DOMObjectInternal;
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (283911 => 283912)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2021-10-11 18:05:45 UTC (rev 283912)
@@ -1,3 +1,21 @@
+2021-10-11 Chris Dumez <[email protected]>
+
+ DOMTimeStamp is now EpochTimeStamp
+ https://bugs.webkit.org/show_bug.cgi?id=231496
+
+ Reviewed by Sam Weinig.
+
+ * DOMEventsClasses.cpp:
+ (DOMEvent::timeStamp):
+ * DOMEventsClasses.h:
+ (DOMUIEvent::timeStamp):
+ (DOMKeyboardEvent::timeStamp):
+ (DOMMouseEvent::timeStamp):
+ (DOMMutationEvent::timeStamp):
+ (DOMOverflowEvent::timeStamp):
+ (DOMWheelEvent::timeStamp):
+ * Interfaces/DOMEvents.idl:
+
2021-09-28 Chris Dumez <[email protected]>
Move Cross-Origin-Opener-Policy handling to the NetworkProcess
Modified: trunk/Source/WebKitLegacy/win/DOMEventsClasses.cpp (283911 => 283912)
--- trunk/Source/WebKitLegacy/win/DOMEventsClasses.cpp 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebKitLegacy/win/DOMEventsClasses.cpp 2021-10-11 18:05:45 UTC (rev 283912)
@@ -208,7 +208,7 @@
return E_NOTIMPL;
}
-HRESULT DOMEvent::timeStamp(_Out_ DOMTimeStamp* /*result*/)
+HRESULT DOMEvent::timeStamp(_Out_ EpochTimeStamp* /*result*/)
{
ASSERT_NOT_REACHED();
return E_NOTIMPL;
Modified: trunk/Source/WebKitLegacy/win/DOMEventsClasses.h (283911 => 283912)
--- trunk/Source/WebKitLegacy/win/DOMEventsClasses.h 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebKitLegacy/win/DOMEventsClasses.h 2021-10-11 18:05:45 UTC (rev 283912)
@@ -167,7 +167,7 @@
virtual HRESULT STDMETHODCALLTYPE eventPhase(_Out_ unsigned short* result);
virtual HRESULT STDMETHODCALLTYPE bubbles(_Out_ BOOL* result);
virtual HRESULT STDMETHODCALLTYPE cancelable(_Out_ BOOL* result);
- virtual HRESULT STDMETHODCALLTYPE timeStamp(_Out_ DOMTimeStamp* result);
+ virtual HRESULT STDMETHODCALLTYPE timeStamp(_Out_ EpochTimeStamp* result);
virtual HRESULT STDMETHODCALLTYPE stopPropagation();
virtual HRESULT STDMETHODCALLTYPE preventDefault();
virtual HRESULT STDMETHODCALLTYPE initEvent(_In_ BSTR eventTypeArg, BOOL canBubbleArg, BOOL cancelableArg);
@@ -263,7 +263,7 @@
return DOMEvent::cancelable(result);
}
- virtual HRESULT STDMETHODCALLTYPE timeStamp(_Out_ DOMTimeStamp* result)
+ virtual HRESULT STDMETHODCALLTYPE timeStamp(_Out_ EpochTimeStamp* result)
{
return DOMEvent::timeStamp(result);
}
@@ -380,7 +380,7 @@
return DOMEvent::cancelable(result);
}
- virtual HRESULT STDMETHODCALLTYPE timeStamp(_Out_ DOMTimeStamp* result)
+ virtual HRESULT STDMETHODCALLTYPE timeStamp(_Out_ EpochTimeStamp* result)
{
return DOMEvent::timeStamp(result);
}
@@ -548,7 +548,7 @@
return DOMEvent::cancelable(result);
}
- virtual HRESULT STDMETHODCALLTYPE timeStamp(_Out_ DOMTimeStamp* result)
+ virtual HRESULT STDMETHODCALLTYPE timeStamp(_Out_ EpochTimeStamp* result)
{
return DOMEvent::timeStamp(result);
}
@@ -725,7 +725,7 @@
return DOMEvent::cancelable(result);
}
- virtual HRESULT STDMETHODCALLTYPE timeStamp(_Out_ DOMTimeStamp* result)
+ virtual HRESULT STDMETHODCALLTYPE timeStamp(_Out_ EpochTimeStamp* result)
{
return DOMEvent::timeStamp(result);
}
@@ -840,7 +840,7 @@
return DOMEvent::cancelable(result);
}
- virtual HRESULT STDMETHODCALLTYPE timeStamp(_Out_ DOMTimeStamp* result)
+ virtual HRESULT STDMETHODCALLTYPE timeStamp(_Out_ EpochTimeStamp* result)
{
return DOMEvent::timeStamp(result);
}
@@ -950,7 +950,7 @@
return DOMEvent::cancelable(result);
}
- virtual HRESULT STDMETHODCALLTYPE timeStamp(_Out_ DOMTimeStamp* result)
+ virtual HRESULT STDMETHODCALLTYPE timeStamp(_Out_ EpochTimeStamp* result)
{
return DOMEvent::timeStamp(result);
}
Modified: trunk/Source/WebKitLegacy/win/Interfaces/DOMEvents.idl (283911 => 283912)
--- trunk/Source/WebKitLegacy/win/Interfaces/DOMEvents.idl 2021-10-11 17:52:56 UTC (rev 283911)
+++ trunk/Source/WebKitLegacy/win/Interfaces/DOMEvents.idl 2021-10-11 18:05:45 UTC (rev 283912)
@@ -42,7 +42,7 @@
interface IDOMWheelEvent;
interface IDOMWindow;
-typedef long long DOMTimeStamp;
+typedef long long EpochTimeStamp;
[
object,
@@ -105,8 +105,8 @@
//readonly attribute boolean cancelable;
HRESULT cancelable([out, retval] BOOL* result);
- //readonly attribute DOMTimeStamp timeStamp;
- HRESULT timeStamp([out, retval] DOMTimeStamp* result);
+ //readonly attribute EpochTimeStamp timeStamp;
+ HRESULT timeStamp([out, retval] EpochTimeStamp* result);
//void stopPropagation();
HRESULT stopPropagation();
