Diff
Modified: trunk/Source/WebCore/ChangeLog (237716 => 237717)
--- trunk/Source/WebCore/ChangeLog 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/ChangeLog 2018-11-02 03:35:57 UTC (rev 237717)
@@ -1,3 +1,101 @@
+2018-11-01 Chris Dumez <cdu...@apple.com>
+
+ [WebIDL] Rename CallWith=ScriptState to CallWith=ExecState
+ https://bugs.webkit.org/show_bug.cgi?id=191162
+
+ Reviewed by Alex Christensen.
+
+ Rename CallWith=ScriptState to CallWith=ExecState in our Web IDL as ScriptState is no longer a thing
+ in modern WebKit. The implementation is actually passed an ExecState nowadays.
+
+ * Modules/applepay/ApplePaySession.idl:
+ * Modules/encryptedmedia/MediaKeyStatusMap.idl:
+ * Modules/fetch/FetchBody.idl:
+ * Modules/indexeddb/IDBCursor.idl:
+ * Modules/indexeddb/IDBFactory.idl:
+ * Modules/indexeddb/IDBIndex.idl:
+ * Modules/indexeddb/IDBKeyRange.idl:
+ * Modules/indexeddb/IDBObjectStore.idl:
+ * Modules/mediastream/RTCPeerConnection.idl:
+ * animation/Animatable.idl:
+ * animation/KeyframeEffect.idl:
+ * animation/KeyframeEffectReadOnly.idl:
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateCallWith):
+ (GenerateConstructorDefinition):
+ * bindings/scripts/IDLAttributes.json:
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::jsTestObjWithExecStateAttributeGetter):
+ (WebCore::jsTestObjWithExecStateAttribute):
+ (WebCore::setJSTestObjWithExecStateAttributeSetter):
+ (WebCore::setJSTestObjWithExecStateAttribute):
+ (WebCore::jsTestObjWithScriptExecutionContextAndExecStateAttributeGetter):
+ (WebCore::jsTestObjWithScriptExecutionContextAndExecStateAttribute):
+ (WebCore::setJSTestObjWithScriptExecutionContextAndExecStateAttributeSetter):
+ (WebCore::setJSTestObjWithScriptExecutionContextAndExecStateAttribute):
+ (WebCore::jsTestObjWithScriptExecutionContextAndExecStateWithSpacesAttributeGetter):
+ (WebCore::jsTestObjWithScriptExecutionContextAndExecStateWithSpacesAttribute):
+ (WebCore::setJSTestObjWithScriptExecutionContextAndExecStateWithSpacesAttributeSetter):
+ (WebCore::setJSTestObjWithScriptExecutionContextAndExecStateWithSpacesAttribute):
+ (WebCore::jsTestObjPrototypeFunctionWithExecStateVoidBody):
+ (WebCore::jsTestObjPrototypeFunctionWithExecStateVoid):
+ (WebCore::jsTestObjPrototypeFunctionWithExecStateObjBody):
+ (WebCore::jsTestObjPrototypeFunctionWithExecStateObj):
+ (WebCore::jsTestObjPrototypeFunctionWithExecStateVoidExceptionBody):
+ (WebCore::jsTestObjPrototypeFunctionWithExecStateVoidException):
+ (WebCore::jsTestObjPrototypeFunctionWithExecStateObjExceptionBody):
+ (WebCore::jsTestObjPrototypeFunctionWithExecStateObjException):
+ (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecStateBody):
+ (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecState):
+ (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecStateObjExceptionBody):
+ (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecStateObjException):
+ (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecStateWithSpacesBody):
+ (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecStateWithSpaces):
+ (WebCore::jsTestObjWithScriptStateAttributeGetter): Deleted.
+ (WebCore::jsTestObjWithScriptStateAttribute): Deleted.
+ (WebCore::setJSTestObjWithScriptStateAttributeSetter): Deleted.
+ (WebCore::setJSTestObjWithScriptStateAttribute): Deleted.
+ (WebCore::jsTestObjWithScriptExecutionContextAndScriptStateAttributeGetter): Deleted.
+ (WebCore::jsTestObjWithScriptExecutionContextAndScriptStateAttribute): Deleted.
+ (WebCore::setJSTestObjWithScriptExecutionContextAndScriptStateAttributeSetter): Deleted.
+ (WebCore::setJSTestObjWithScriptExecutionContextAndScriptStateAttribute): Deleted.
+ (WebCore::jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttributeGetter): Deleted.
+ (WebCore::jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute): Deleted.
+ (WebCore::setJSTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttributeSetter): Deleted.
+ (WebCore::setJSTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute): Deleted.
+ (WebCore::jsTestObjPrototypeFunctionWithScriptStateVoidBody): Deleted.
+ (WebCore::jsTestObjPrototypeFunctionWithScriptStateVoid): Deleted.
+ (WebCore::jsTestObjPrototypeFunctionWithScriptStateObjBody): Deleted.
+ (WebCore::jsTestObjPrototypeFunctionWithScriptStateObj): Deleted.
+ (WebCore::jsTestObjPrototypeFunctionWithScriptStateVoidExceptionBody): Deleted.
+ (WebCore::jsTestObjPrototypeFunctionWithScriptStateVoidException): Deleted.
+ (WebCore::jsTestObjPrototypeFunctionWithScriptStateObjExceptionBody): Deleted.
+ (WebCore::jsTestObjPrototypeFunctionWithScriptStateObjException): Deleted.
+ (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateBody): Deleted.
+ (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptState): Deleted.
+ (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateObjExceptionBody): Deleted.
+ (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateObjException): Deleted.
+ (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateWithSpacesBody): Deleted.
+ (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateWithSpaces): Deleted.
+ * bindings/scripts/test/TestObj.idl:
+ * bindings/scripts/test/TestPromiseRejectionEvent.idl:
+ * crypto/SubtleCrypto.idl:
+ * dom/Element.idl:
+ * dom/ErrorEvent.idl:
+ * dom/MessagePort.idl:
+ * dom/MouseEvent.idl:
+ * html/HTMLCanvasElement.idl:
+ * html/HTMLFrameElement.idl:
+ * html/OffscreenCanvas.idl:
+ * html/track/DataCue.idl:
+ * inspector/CommandLineAPIHost.idl:
+ * page/DOMWindow.idl:
+ * page/RemoteDOMWindow.idl:
+ * page/WindowOrWorkerGlobalScope.idl:
+ * testing/Internals.idl:
+ * workers/DedicatedWorkerGlobalScope.idl:
+ * workers/Worker.idl:
+
2018-11-01 Fujii Hironori <hironori.fu...@sony.com>
Rename <wtf/unicode/UTF8.h> to <wtf/unicode/UTF8Conversion.h> in order to avoid conflicting with ICU's unicode/utf8.h
Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl (237716 => 237717)
--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -47,7 +47,7 @@
[MayThrowException] void begin();
[MayThrowException] void abort();
- [MayThrowException, CallWith=ScriptState] void completeMerchantValidation(any merchantSession);
+ [MayThrowException, CallWith=ExecState] void completeMerchantValidation(any merchantSession);
[MayThrowException, Conditional=APPLE_PAY_SESSION_V3] void completeShippingMethodSelection(ApplePayShippingMethodUpdate update);
[MayThrowException, Conditional=APPLE_PAY_SESSION_V3] void completeShippingContactSelection(ApplePayShippingContactUpdate update);
[MayThrowException, Conditional=APPLE_PAY_SESSION_V3] void completePaymentMethodSelection(ApplePayPaymentMethodUpdate update);
Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyStatusMap.idl (237716 => 237717)
--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyStatusMap.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyStatusMap.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -44,5 +44,5 @@
iterable<BufferSource, MediaKeyStatus>;
readonly attribute unsigned long size;
boolean has(BufferSource keyId);
- [CallWith=ScriptState] any get(BufferSource keyId);
+ [CallWith=ExecState] any get(BufferSource keyId);
};
Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.idl (237716 => 237717)
--- trunk/Source/WebCore/Modules/fetch/FetchBody.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -32,7 +32,7 @@
InterfaceName=Body,
NoInterfaceObject
] interface FetchBody {
- [ImplementedAs=readableStream, CallWith=ScriptState] readonly attribute ReadableStream? body;
+ [ImplementedAs=readableStream, CallWith=ExecState] readonly attribute ReadableStream? body;
readonly attribute boolean bodyUsed;
[NewObject] Promise<ArrayBuffer> arrayBuffer();
[NewObject] Promise<Blob> blob();
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCursor.idl (237716 => 237717)
--- trunk/Source/WebCore/Modules/indexeddb/IDBCursor.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCursor.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -34,9 +34,9 @@
readonly attribute any key;
readonly attribute any primaryKey;
- [CallWith=ScriptState, MayThrowException] IDBRequest update(any value);
+ [CallWith=ExecState, MayThrowException] IDBRequest update(any value);
[MayThrowException] void advance([EnforceRange] unsigned long count);
- [CallWith=ScriptState, ImplementedAs=continueFunction, MayThrowException] void continue(optional any key);
- [CallWith=ScriptState, MayThrowException] void continuePrimaryKey(any key, any primaryKey);
- [CallWith=ScriptState, ImplementedAs=deleteFunction, MayThrowException] IDBRequest delete();
+ [CallWith=ExecState, ImplementedAs=continueFunction, MayThrowException] void continue(optional any key);
+ [CallWith=ExecState, MayThrowException] void continuePrimaryKey(any key, any primaryKey);
+ [CallWith=ExecState, ImplementedAs=deleteFunction, MayThrowException] IDBRequest delete();
};
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBFactory.idl (237716 => 237717)
--- trunk/Source/WebCore/Modules/indexeddb/IDBFactory.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBFactory.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -29,5 +29,5 @@
] interface IDBFactory {
[CallWith=ScriptExecutionContext, MayThrowException] IDBOpenDBRequest open(DOMString name, optional [EnforceRange] unsigned long long version);
[CallWith=ScriptExecutionContext, MayThrowException] IDBOpenDBRequest deleteDatabase(DOMString name);
- [CallWith=ScriptState, MayThrowException] short cmp(any first, any second);
+ [CallWith=ExecState, MayThrowException] short cmp(any first, any second);
};
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBIndex.idl (237716 => 237717)
--- trunk/Source/WebCore/Modules/indexeddb/IDBIndex.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBIndex.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -39,20 +39,20 @@
readonly attribute boolean multiEntry;
readonly attribute boolean unique;
- [CallWith=ScriptState, MayThrowException] IDBRequest openCursor(optional IDBKeyRange? range = null, optional IDBCursorDirection direction = "next");
- [CallWith=ScriptState, MayThrowException] IDBRequest openCursor(any key, optional IDBCursorDirection direction = "next");
+ [CallWith=ExecState, MayThrowException] IDBRequest openCursor(optional IDBKeyRange? range = null, optional IDBCursorDirection direction = "next");
+ [CallWith=ExecState, MayThrowException] IDBRequest openCursor(any key, optional IDBCursorDirection direction = "next");
- [CallWith=ScriptState, MayThrowException] IDBRequest openKeyCursor(optional IDBKeyRange? range = null, optional IDBCursorDirection direction = "next");
- [CallWith=ScriptState, MayThrowException] IDBRequest openKeyCursor(any key, optional IDBCursorDirection direction = "next");
+ [CallWith=ExecState, MayThrowException] IDBRequest openKeyCursor(optional IDBKeyRange? range = null, optional IDBCursorDirection direction = "next");
+ [CallWith=ExecState, MayThrowException] IDBRequest openKeyCursor(any key, optional IDBCursorDirection direction = "next");
- [CallWith=ScriptState, MayThrowException] IDBRequest get(IDBKeyRange? key);
- [CallWith=ScriptState, MayThrowException] IDBRequest get(any key);
- [CallWith=ScriptState, MayThrowException] IDBRequest getKey(IDBKeyRange? key);
- [CallWith=ScriptState, MayThrowException] IDBRequest getKey(any key);
- [CallWith=ScriptState, MayThrowException] IDBRequest getAll(optional IDBKeyRange? range = null, optional [EnforceRange] unsigned long count);
- [CallWith=ScriptState, MayThrowException] IDBRequest getAll(any key, optional [EnforceRange] unsigned long count);
- [CallWith=ScriptState, MayThrowException] IDBRequest getAllKeys(optional IDBKeyRange? range = null, optional [EnforceRange] unsigned long count);
- [CallWith=ScriptState, MayThrowException] IDBRequest getAllKeys(any key, optional [EnforceRange] unsigned long count);
- [CallWith=ScriptState, MayThrowException] IDBRequest count(optional IDBKeyRange? range = null);
- [CallWith=ScriptState, MayThrowException] IDBRequest count(any key);
+ [CallWith=ExecState, MayThrowException] IDBRequest get(IDBKeyRange? key);
+ [CallWith=ExecState, MayThrowException] IDBRequest get(any key);
+ [CallWith=ExecState, MayThrowException] IDBRequest getKey(IDBKeyRange? key);
+ [CallWith=ExecState, MayThrowException] IDBRequest getKey(any key);
+ [CallWith=ExecState, MayThrowException] IDBRequest getAll(optional IDBKeyRange? range = null, optional [EnforceRange] unsigned long count);
+ [CallWith=ExecState, MayThrowException] IDBRequest getAll(any key, optional [EnforceRange] unsigned long count);
+ [CallWith=ExecState, MayThrowException] IDBRequest getAllKeys(optional IDBKeyRange? range = null, optional [EnforceRange] unsigned long count);
+ [CallWith=ExecState, MayThrowException] IDBRequest getAllKeys(any key, optional [EnforceRange] unsigned long count);
+ [CallWith=ExecState, MayThrowException] IDBRequest count(optional IDBKeyRange? range = null);
+ [CallWith=ExecState, MayThrowException] IDBRequest count(any key);
};
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.idl (237716 => 237717)
--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -32,10 +32,10 @@
readonly attribute boolean lowerOpen;
readonly attribute boolean upperOpen;
- [CallWith=ScriptState, MayThrowException] static IDBKeyRange only(any value);
- [CallWith=ScriptState, MayThrowException] static IDBKeyRange lowerBound(any lower, optional boolean open = false);
- [CallWith=ScriptState, MayThrowException] static IDBKeyRange upperBound(any upper, optional boolean open = false);
- [CallWith=ScriptState, MayThrowException] static IDBKeyRange bound(any lower, any upper, optional boolean lowerOpen = false, optional boolean upperOpen = false);
+ [CallWith=ExecState, MayThrowException] static IDBKeyRange only(any value);
+ [CallWith=ExecState, MayThrowException] static IDBKeyRange lowerBound(any lower, optional boolean open = false);
+ [CallWith=ExecState, MayThrowException] static IDBKeyRange upperBound(any upper, optional boolean open = false);
+ [CallWith=ExecState, MayThrowException] static IDBKeyRange bound(any lower, any upper, optional boolean lowerOpen = false, optional boolean upperOpen = false);
- [CallWith=ScriptState, MayThrowException] boolean includes(any key);
+ [CallWith=ExecState, MayThrowException] boolean includes(any key);
};
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.idl (237716 => 237717)
--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -39,28 +39,28 @@
readonly attribute IDBTransaction transaction;
readonly attribute boolean autoIncrement;
- [CallWith=ScriptState, MayThrowException] IDBRequest put(any value, optional any key);
- [CallWith=ScriptState, MayThrowException] IDBRequest add(any value, optional any key);
- [CallWith=ScriptState, ImplementedAs=deleteFunction, MayThrowException] IDBRequest delete(IDBKeyRange? keyRange);
- [CallWith=ScriptState, ImplementedAs=deleteFunction, MayThrowException] IDBRequest delete(any key);
- [CallWith=ScriptState, MayThrowException] IDBRequest get(IDBKeyRange? key);
- [CallWith=ScriptState, MayThrowException] IDBRequest get(any key);
- [CallWith=ScriptState, MayThrowException] IDBRequest getKey(IDBKeyRange? key);
- [CallWith=ScriptState, MayThrowException] IDBRequest getKey(any key);
- [CallWith=ScriptState, MayThrowException] IDBRequest clear();
- [CallWith=ScriptState, MayThrowException] IDBRequest openCursor(optional IDBKeyRange? range = null, optional IDBCursorDirection direction = "next");
- [CallWith=ScriptState, MayThrowException] IDBRequest openCursor(any key, optional IDBCursorDirection direction = "next");
- [CallWith=ScriptState, MayThrowException] IDBRequest openKeyCursor(optional IDBKeyRange? range = null, optional IDBCursorDirection direction = "next");
- [CallWith=ScriptState, MayThrowException] IDBRequest openKeyCursor(any key, optional IDBCursorDirection direction = "next");
- [CallWith=ScriptState, MayThrowException] IDBRequest getAll(optional IDBKeyRange? range = null, optional [EnforceRange] unsigned long count);
- [CallWith=ScriptState, MayThrowException] IDBRequest getAll(any key, optional [EnforceRange] unsigned long count);
- [CallWith=ScriptState, MayThrowException] IDBRequest getAllKeys(optional IDBKeyRange? range = null, optional [EnforceRange] unsigned long count);
- [CallWith=ScriptState, MayThrowException] IDBRequest getAllKeys(any key, optional [EnforceRange] unsigned long count);
- [CallWith=ScriptState, MayThrowException] IDBIndex createIndex(DOMString name, (DOMString or sequence<DOMString>) keyPath, optional IDBIndexParameters options);
+ [CallWith=ExecState, MayThrowException] IDBRequest put(any value, optional any key);
+ [CallWith=ExecState, MayThrowException] IDBRequest add(any value, optional any key);
+ [CallWith=ExecState, ImplementedAs=deleteFunction, MayThrowException] IDBRequest delete(IDBKeyRange? keyRange);
+ [CallWith=ExecState, ImplementedAs=deleteFunction, MayThrowException] IDBRequest delete(any key);
+ [CallWith=ExecState, MayThrowException] IDBRequest get(IDBKeyRange? key);
+ [CallWith=ExecState, MayThrowException] IDBRequest get(any key);
+ [CallWith=ExecState, MayThrowException] IDBRequest getKey(IDBKeyRange? key);
+ [CallWith=ExecState, MayThrowException] IDBRequest getKey(any key);
+ [CallWith=ExecState, MayThrowException] IDBRequest clear();
+ [CallWith=ExecState, MayThrowException] IDBRequest openCursor(optional IDBKeyRange? range = null, optional IDBCursorDirection direction = "next");
+ [CallWith=ExecState, MayThrowException] IDBRequest openCursor(any key, optional IDBCursorDirection direction = "next");
+ [CallWith=ExecState, MayThrowException] IDBRequest openKeyCursor(optional IDBKeyRange? range = null, optional IDBCursorDirection direction = "next");
+ [CallWith=ExecState, MayThrowException] IDBRequest openKeyCursor(any key, optional IDBCursorDirection direction = "next");
+ [CallWith=ExecState, MayThrowException] IDBRequest getAll(optional IDBKeyRange? range = null, optional [EnforceRange] unsigned long count);
+ [CallWith=ExecState, MayThrowException] IDBRequest getAll(any key, optional [EnforceRange] unsigned long count);
+ [CallWith=ExecState, MayThrowException] IDBRequest getAllKeys(optional IDBKeyRange? range = null, optional [EnforceRange] unsigned long count);
+ [CallWith=ExecState, MayThrowException] IDBRequest getAllKeys(any key, optional [EnforceRange] unsigned long count);
+ [CallWith=ExecState, MayThrowException] IDBIndex createIndex(DOMString name, (DOMString or sequence<DOMString>) keyPath, optional IDBIndexParameters options);
[MayThrowException] IDBIndex index(DOMString name);
[MayThrowException] void deleteIndex(DOMString name);
- [CallWith=ScriptState, MayThrowException] IDBRequest count(optional IDBKeyRange? range = null);
- [CallWith=ScriptState, MayThrowException] IDBRequest count(any key);
+ [CallWith=ExecState, MayThrowException] IDBRequest count(optional IDBKeyRange? range = null);
+ [CallWith=ExecState, MayThrowException] IDBRequest count(any key);
};
dictionary IDBIndexParameters {
Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl (237716 => 237717)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -128,7 +128,7 @@
// 4.11 Certificate management
- [CallWith=ScriptState] static Promise<RTCCertificate> generateCertificate(AlgorithmIdentifier keygenAlgorithm);
+ [CallWith=ExecState] static Promise<RTCCertificate> generateCertificate(AlgorithmIdentifier keygenAlgorithm);
// 5.1 RTCPeerConnection extensions
// RTP Media API extensions
Modified: trunk/Source/WebCore/animation/Animatable.idl (237716 => 237717)
--- trunk/Source/WebCore/animation/Animatable.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/animation/Animatable.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -27,6 +27,6 @@
EnabledAtRuntime=WebAnimations,
NoInterfaceObject
] interface Animatable {
- [MayThrowException, CallWith=ScriptState] WebAnimation animate(object? keyframes, optional (unrestricted double or KeyframeAnimationOptions) options);
+ [MayThrowException, CallWith=ExecState] WebAnimation animate(object? keyframes, optional (unrestricted double or KeyframeAnimationOptions) options);
sequence<WebAnimation> getAnimations();
};
Modified: trunk/Source/WebCore/animation/KeyframeEffect.idl (237716 => 237717)
--- trunk/Source/WebCore/animation/KeyframeEffect.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/animation/KeyframeEffect.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -27,7 +27,7 @@
EnabledAtRuntime=WebAnimations,
Exposed=Window,
ConstructorMayThrowException,
- ConstructorCallWith=ScriptState,
+ ConstructorCallWith=ExecState,
Constructor(Element? target, object? keyframes, optional (unrestricted double or KeyframeEffectOptions) options),
Constructor(KeyframeEffectReadOnly source)
] interface KeyframeEffect : KeyframeEffectReadOnly {
@@ -34,5 +34,5 @@
inherit attribute Element? target;
inherit attribute IterationCompositeOperation iterationComposite;
inherit attribute CompositeOperation composite;
- [MayThrowException, CallWith=ScriptState] void setKeyframes(object? keyframes);
+ [MayThrowException, CallWith=ExecState] void setKeyframes(object? keyframes);
};
Modified: trunk/Source/WebCore/animation/KeyframeEffectReadOnly.idl (237716 => 237717)
--- trunk/Source/WebCore/animation/KeyframeEffectReadOnly.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/animation/KeyframeEffectReadOnly.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -28,7 +28,7 @@
Exposed=Window,
JSGenerateToNativeObject,
ConstructorMayThrowException,
- ConstructorCallWith=ScriptState,
+ ConstructorCallWith=ExecState,
Constructor(Element? target, object? keyframes, optional (unrestricted double or KeyframeEffectOptions) options),
Constructor(KeyframeEffectReadOnly source)
] interface KeyframeEffectReadOnly : AnimationEffectReadOnly {
@@ -35,7 +35,7 @@
readonly attribute Element? target;
readonly attribute IterationCompositeOperation iterationComposite;
readonly attribute CompositeOperation composite;
- [CallWith=ScriptState] sequence<object> getKeyframes();
+ [CallWith=ExecState] sequence<object> getKeyframes();
};
dictionary BasePropertyIndexedKeyframe {
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (237716 => 237717)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2018-11-02 03:35:57 UTC (rev 237717)
@@ -5521,7 +5521,7 @@
$indent ||= " ";
my @callWithArgs;
- push(@callWithArgs, $stateReference) if $codeGenerator->ExtendedAttributeContains($callWith, "ScriptState");
+ push(@callWithArgs, $stateReference) if $codeGenerator->ExtendedAttributeContains($callWith, "ExecState");
push(@callWithArgs, "*${globalObject}") if $codeGenerator->ExtendedAttributeContains($callWith, "GlobalObject");
if ($codeGenerator->ExtendedAttributeContains($callWith, "ScriptExecutionContext")) {
push(@$outputArray, $indent . "auto* context = ${scriptExecutionContextAccessor}->scriptExecutionContext();\n");
@@ -7146,7 +7146,7 @@
my $functionString = GenerateParametersCheck($outputArray, $operation, $interface, $functionImplementationName, " ");
push(@$outputArray, " auto object = ${functionString};\n");
- push(@$outputArray, " RETURN_IF_EXCEPTION(throwScope, encodedJSValue());\n") if $codeGenerator->ExtendedAttributeContains($interface->extendedAttributes->{ConstructorCallWith}, "ScriptState");
+ push(@$outputArray, " RETURN_IF_EXCEPTION(throwScope, encodedJSValue());\n") if $codeGenerator->ExtendedAttributeContains($interface->extendedAttributes->{ConstructorCallWith}, "ExecState");
my $IDLType = GetIDLType($interface, $interface->type);
Modified: trunk/Source/WebCore/bindings/scripts/IDLAttributes.json (237716 => 237717)
--- trunk/Source/WebCore/bindings/scripts/IDLAttributes.json 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/bindings/scripts/IDLAttributes.json 2018-11-02 03:35:57 UTC (rev 237717)
@@ -46,7 +46,7 @@
},
"CallWith": {
"contextsAllowed": ["attribute", "operation"],
- "values": ["Document", "ScriptExecutionContext", "ScriptState", "GlobalObject", "ActiveWindow", "FirstWindow", "ResponsibleDocument", "World"]
+ "values": ["Document", "ExecState", "ScriptExecutionContext", "GlobalObject", "ActiveWindow", "FirstWindow", "ResponsibleDocument", "World"]
},
"CheckSecurity": {
"contextsAllowed": ["interface"]
@@ -80,7 +80,7 @@
},
"ConstructorCallWith": {
"contextsAllowed": ["interface"],
- "values": ["Document", "RuntimeFlags", "ScriptExecutionContext", "ScriptState"]
+ "values": ["Document", "ExecState", "RuntimeFlags", "ScriptExecutionContext"]
},
"ConstructorMayThrowException": {
"contextsAllowed": ["interface"]
@@ -425,7 +425,7 @@
},
"SetterCallWith": {
"contextsAllowed": ["attribute"],
- "values": ["ScriptExecutionContext", "ScriptState", "GlobalObject", "ActiveWindow", "FirstWindow"]
+ "values": ["ExecState", "ScriptExecutionContext", "GlobalObject", "ActiveWindow", "FirstWindow"]
},
"SkipCallbackInvokeCheck": {
"contextsAllowed": ["operation", "callback-function"]
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (237716 => 237717)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2018-11-02 03:35:57 UTC (rev 237717)
@@ -1467,14 +1467,14 @@
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionPublicAndPrivateMethod(JSC::ExecState*);
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionAddEventListener(JSC::ExecState*);
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionRemoveEventListener(JSC::ExecState*);
-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateVoid(JSC::ExecState*);
-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateObj(JSC::ExecState*);
-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateVoidException(JSC::ExecState*);
-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateObjException(JSC::ExecState*);
+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithExecStateVoid(JSC::ExecState*);
+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithExecStateObj(JSC::ExecState*);
+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithExecStateVoidException(JSC::ExecState*);
+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithExecStateObjException(JSC::ExecState*);
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContext(JSC::ExecState*);
-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptState(JSC::ExecState*);
-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateObjException(JSC::ExecState*);
-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateWithSpaces(JSC::ExecState*);
+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecState(JSC::ExecState*);
+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecStateObjException(JSC::ExecState*);
+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecStateWithSpaces(JSC::ExecState*);
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithDocumentArgument(JSC::ExecState*);
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithCallerDocumentArgument(JSC::ExecState*);
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithCallerWindowArgument(JSC::ExecState*);
@@ -1701,16 +1701,16 @@
bool setJSTestObjOnfoo(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
JSC::EncodedJSValue jsTestObjOnwebkitfoo(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
bool setJSTestObjOnwebkitfoo(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
-JSC::EncodedJSValue jsTestObjWithScriptStateAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
-bool setJSTestObjWithScriptStateAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
+JSC::EncodedJSValue jsTestObjWithExecStateAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
+bool setJSTestObjWithExecStateAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
JSC::EncodedJSValue jsTestObjWithCallWithAndSetterCallWithAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
bool setJSTestObjWithCallWithAndSetterCallWithAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
bool setJSTestObjWithScriptExecutionContextAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
-JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
-bool setJSTestObjWithScriptExecutionContextAndScriptStateAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
-JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
-bool setJSTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
+JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAndExecStateAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
+bool setJSTestObjWithScriptExecutionContextAndExecStateAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
+JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAndExecStateWithSpacesAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
+bool setJSTestObjWithScriptExecutionContextAndExecStateWithSpacesAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
#if ENABLE(Condition1)
JSC::EncodedJSValue jsTestObjConditionalAttr1(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
bool setJSTestObjConditionalAttr1(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
@@ -2050,11 +2050,11 @@
#endif
{ "onfoo", static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute), NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjOnfoo), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjOnfoo) } },
{ "onwebkitfoo", static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute), NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjOnwebkitfoo), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjOnwebkitfoo) } },
- { "withScriptStateAttribute", static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute), NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjWithScriptStateAttribute), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjWithScriptStateAttribute) } },
+ { "withExecStateAttribute", static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute), NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjWithExecStateAttribute), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjWithExecStateAttribute) } },
{ "withCallWithAndSetterCallWithAttribute", static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute), NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjWithCallWithAndSetterCallWithAttribute), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjWithCallWithAndSetterCallWithAttribute) } },
{ "withScriptExecutionContextAttribute", static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute), NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjWithScriptExecutionContextAttribute), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjWithScriptExecutionContextAttribute) } },
- { "withScriptExecutionContextAndScriptStateAttribute", static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute), NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjWithScriptExecutionContextAndScriptStateAttribute), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjWithScriptExecutionContextAndScriptStateAttribute) } },
- { "withScriptExecutionContextAndScriptStateWithSpacesAttribute", static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute), NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute) } },
+ { "withScriptExecutionContextAndExecStateAttribute", static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute), NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjWithScriptExecutionContextAndExecStateAttribute), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjWithScriptExecutionContextAndExecStateAttribute) } },
+ { "withScriptExecutionContextAndExecStateWithSpacesAttribute", static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute), NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjWithScriptExecutionContextAndExecStateWithSpacesAttribute), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjWithScriptExecutionContextAndExecStateWithSpacesAttribute) } },
#if ENABLE(Condition1)
{ "conditionalAttr1", static_cast<unsigned>(JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute), NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjConditionalAttr1), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjConditionalAttr1) } },
#else
@@ -2172,14 +2172,14 @@
{ "publicAndPrivateMethod", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionPublicAndPrivateMethod), (intptr_t) (1) } },
{ "addEventListener", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionAddEventListener), (intptr_t) (2) } },
{ "removeEventListener", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionRemoveEventListener), (intptr_t) (2) } },
- { "withScriptStateVoid", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithScriptStateVoid), (intptr_t) (0) } },
- { "withScriptStateObj", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithScriptStateObj), (intptr_t) (0) } },
- { "withScriptStateVoidException", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithScriptStateVoidException), (intptr_t) (0) } },
- { "withScriptStateObjException", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithScriptStateObjException), (intptr_t) (0) } },
+ { "withExecStateVoid", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithExecStateVoid), (intptr_t) (0) } },
+ { "withExecStateObj", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithExecStateObj), (intptr_t) (0) } },
+ { "withExecStateVoidException", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithExecStateVoidException), (intptr_t) (0) } },
+ { "withExecStateObjException", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithExecStateObjException), (intptr_t) (0) } },
{ "withScriptExecutionContext", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithScriptExecutionContext), (intptr_t) (0) } },
- { "withScriptExecutionContextAndScriptState", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptState), (intptr_t) (0) } },
- { "withScriptExecutionContextAndScriptStateObjException", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateObjException), (intptr_t) (0) } },
- { "withScriptExecutionContextAndScriptStateWithSpaces", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateWithSpaces), (intptr_t) (0) } },
+ { "withScriptExecutionContextAndExecState", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecState), (intptr_t) (0) } },
+ { "withScriptExecutionContextAndExecStateObjException", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecStateObjException), (intptr_t) (0) } },
+ { "withScriptExecutionContextAndExecStateWithSpaces", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecStateWithSpaces), (intptr_t) (0) } },
{ "withDocumentArgument", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithDocumentArgument), (intptr_t) (0) } },
{ "withCallerDocumentArgument", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithCallerDocumentArgument), (intptr_t) (0) } },
{ "withCallerWindowArgument", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionWithCallerWindowArgument), (intptr_t) (0) } },
@@ -4135,21 +4135,21 @@
return IDLAttribute<JSTestObj>::set<setJSTestObjOnwebkitfooSetter>(*state, thisValue, encodedValue, "onwebkitfoo");
}
-static inline JSValue jsTestObjWithScriptStateAttributeGetter(ExecState& state, JSTestObj& thisObject, ThrowScope& throwScope)
+static inline JSValue jsTestObjWithExecStateAttributeGetter(ExecState& state, JSTestObj& thisObject, ThrowScope& throwScope)
{
UNUSED_PARAM(throwScope);
UNUSED_PARAM(state);
auto& impl = thisObject.wrapped();
- JSValue result = toJS<IDLLong>(state, throwScope, impl.withScriptStateAttribute(state));
+ JSValue result = toJS<IDLLong>(state, throwScope, impl.withExecStateAttribute(state));
return result;
}
-EncodedJSValue jsTestObjWithScriptStateAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
+EncodedJSValue jsTestObjWithExecStateAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
{
- return IDLAttribute<JSTestObj>::get<jsTestObjWithScriptStateAttributeGetter, CastedThisErrorBehavior::Assert>(*state, thisValue, "withScriptStateAttribute");
+ return IDLAttribute<JSTestObj>::get<jsTestObjWithExecStateAttributeGetter, CastedThisErrorBehavior::Assert>(*state, thisValue, "withExecStateAttribute");
}
-static inline bool setJSTestObjWithScriptStateAttributeSetter(ExecState& state, JSTestObj& thisObject, JSValue value, ThrowScope& throwScope)
+static inline bool setJSTestObjWithExecStateAttributeSetter(ExecState& state, JSTestObj& thisObject, JSValue value, ThrowScope& throwScope)
{
UNUSED_PARAM(throwScope);
auto& impl = thisObject.wrapped();
@@ -4156,14 +4156,14 @@
auto nativeValue = convert<IDLLong>(state, value);
RETURN_IF_EXCEPTION(throwScope, false);
AttributeSetter::call(state, throwScope, [&] {
- return impl.setWithScriptStateAttribute(state, WTFMove(nativeValue));
+ return impl.setWithExecStateAttribute(state, WTFMove(nativeValue));
});
return true;
}
-bool setJSTestObjWithScriptStateAttribute(ExecState* state, EncodedJSValue thisValue, EncodedJSValue encodedValue)
+bool setJSTestObjWithExecStateAttribute(ExecState* state, EncodedJSValue thisValue, EncodedJSValue encodedValue)
{
- return IDLAttribute<JSTestObj>::set<setJSTestObjWithScriptStateAttributeSetter>(*state, thisValue, encodedValue, "withScriptStateAttribute");
+ return IDLAttribute<JSTestObj>::set<setJSTestObjWithExecStateAttributeSetter>(*state, thisValue, encodedValue, "withExecStateAttribute");
}
static inline JSValue jsTestObjWithCallWithAndSetterCallWithAttributeGetter(ExecState& state, JSTestObj& thisObject, ThrowScope& throwScope)
@@ -4234,7 +4234,7 @@
return IDLAttribute<JSTestObj>::set<setJSTestObjWithScriptExecutionContextAttributeSetter>(*state, thisValue, encodedValue, "withScriptExecutionContextAttribute");
}
-static inline JSValue jsTestObjWithScriptExecutionContextAndScriptStateAttributeGetter(ExecState& state, JSTestObj& thisObject, ThrowScope& throwScope)
+static inline JSValue jsTestObjWithScriptExecutionContextAndExecStateAttributeGetter(ExecState& state, JSTestObj& thisObject, ThrowScope& throwScope)
{
UNUSED_PARAM(throwScope);
UNUSED_PARAM(state);
@@ -4242,36 +4242,36 @@
if (UNLIKELY(!context))
return jsUndefined();
auto& impl = thisObject.wrapped();
- JSValue result = toJS<IDLInterface<TestObj>>(state, *thisObject.globalObject(), throwScope, impl.withScriptExecutionContextAndScriptStateAttribute(state, *context));
+ JSValue result = toJS<IDLInterface<TestObj>>(state, *thisObject.globalObject(), throwScope, impl.withScriptExecutionContextAndExecStateAttribute(state, *context));
return result;
}
-EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
+EncodedJSValue jsTestObjWithScriptExecutionContextAndExecStateAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
{
- return IDLAttribute<JSTestObj>::get<jsTestObjWithScriptExecutionContextAndScriptStateAttributeGetter, CastedThisErrorBehavior::Assert>(*state, thisValue, "withScriptExecutionContextAndScriptStateAttribute");
+ return IDLAttribute<JSTestObj>::get<jsTestObjWithScriptExecutionContextAndExecStateAttributeGetter, CastedThisErrorBehavior::Assert>(*state, thisValue, "withScriptExecutionContextAndExecStateAttribute");
}
-static inline bool setJSTestObjWithScriptExecutionContextAndScriptStateAttributeSetter(ExecState& state, JSTestObj& thisObject, JSValue value, ThrowScope& throwScope)
+static inline bool setJSTestObjWithScriptExecutionContextAndExecStateAttributeSetter(ExecState& state, JSTestObj& thisObject, JSValue value, ThrowScope& throwScope)
{
UNUSED_PARAM(throwScope);
auto& impl = thisObject.wrapped();
- auto nativeValue = convert<IDLInterface<TestObj>>(state, value, [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwAttributeTypeError(state, scope, "TestObject", "withScriptExecutionContextAndScriptStateAttribute", "TestObj"); });
+ auto nativeValue = convert<IDLInterface<TestObj>>(state, value, [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwAttributeTypeError(state, scope, "TestObject", "withScriptExecutionContextAndExecStateAttribute", "TestObj"); });
RETURN_IF_EXCEPTION(throwScope, false);
auto* context = jsCast<JSDOMGlobalObject*>(state.lexicalGlobalObject())->scriptExecutionContext();
if (UNLIKELY(!context))
return false;
AttributeSetter::call(state, throwScope, [&] {
- return impl.setWithScriptExecutionContextAndScriptStateAttribute(state, *context, *nativeValue);
+ return impl.setWithScriptExecutionContextAndExecStateAttribute(state, *context, *nativeValue);
});
return true;
}
-bool setJSTestObjWithScriptExecutionContextAndScriptStateAttribute(ExecState* state, EncodedJSValue thisValue, EncodedJSValue encodedValue)
+bool setJSTestObjWithScriptExecutionContextAndExecStateAttribute(ExecState* state, EncodedJSValue thisValue, EncodedJSValue encodedValue)
{
- return IDLAttribute<JSTestObj>::set<setJSTestObjWithScriptExecutionContextAndScriptStateAttributeSetter>(*state, thisValue, encodedValue, "withScriptExecutionContextAndScriptStateAttribute");
+ return IDLAttribute<JSTestObj>::set<setJSTestObjWithScriptExecutionContextAndExecStateAttributeSetter>(*state, thisValue, encodedValue, "withScriptExecutionContextAndExecStateAttribute");
}
-static inline JSValue jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttributeGetter(ExecState& state, JSTestObj& thisObject, ThrowScope& throwScope)
+static inline JSValue jsTestObjWithScriptExecutionContextAndExecStateWithSpacesAttributeGetter(ExecState& state, JSTestObj& thisObject, ThrowScope& throwScope)
{
UNUSED_PARAM(throwScope);
UNUSED_PARAM(state);
@@ -4279,33 +4279,33 @@
if (UNLIKELY(!context))
return jsUndefined();
auto& impl = thisObject.wrapped();
- JSValue result = toJS<IDLInterface<TestObj>>(state, *thisObject.globalObject(), throwScope, impl.withScriptExecutionContextAndScriptStateWithSpacesAttribute(state, *context));
+ JSValue result = toJS<IDLInterface<TestObj>>(state, *thisObject.globalObject(), throwScope, impl.withScriptExecutionContextAndExecStateWithSpacesAttribute(state, *context));
return result;
}
-EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
+EncodedJSValue jsTestObjWithScriptExecutionContextAndExecStateWithSpacesAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
{
- return IDLAttribute<JSTestObj>::get<jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttributeGetter, CastedThisErrorBehavior::Assert>(*state, thisValue, "withScriptExecutionContextAndScriptStateWithSpacesAttribute");
+ return IDLAttribute<JSTestObj>::get<jsTestObjWithScriptExecutionContextAndExecStateWithSpacesAttributeGetter, CastedThisErrorBehavior::Assert>(*state, thisValue, "withScriptExecutionContextAndExecStateWithSpacesAttribute");
}
-static inline bool setJSTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttributeSetter(ExecState& state, JSTestObj& thisObject, JSValue value, ThrowScope& throwScope)
+static inline bool setJSTestObjWithScriptExecutionContextAndExecStateWithSpacesAttributeSetter(ExecState& state, JSTestObj& thisObject, JSValue value, ThrowScope& throwScope)
{
UNUSED_PARAM(throwScope);
auto& impl = thisObject.wrapped();
- auto nativeValue = convert<IDLInterface<TestObj>>(state, value, [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwAttributeTypeError(state, scope, "TestObject", "withScriptExecutionContextAndScriptStateWithSpacesAttribute", "TestObj"); });
+ auto nativeValue = convert<IDLInterface<TestObj>>(state, value, [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwAttributeTypeError(state, scope, "TestObject", "withScriptExecutionContextAndExecStateWithSpacesAttribute", "TestObj"); });
RETURN_IF_EXCEPTION(throwScope, false);
auto* context = jsCast<JSDOMGlobalObject*>(state.lexicalGlobalObject())->scriptExecutionContext();
if (UNLIKELY(!context))
return false;
AttributeSetter::call(state, throwScope, [&] {
- return impl.setWithScriptExecutionContextAndScriptStateWithSpacesAttribute(state, *context, *nativeValue);
+ return impl.setWithScriptExecutionContextAndExecStateWithSpacesAttribute(state, *context, *nativeValue);
});
return true;
}
-bool setJSTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute(ExecState* state, EncodedJSValue thisValue, EncodedJSValue encodedValue)
+bool setJSTestObjWithScriptExecutionContextAndExecStateWithSpacesAttribute(ExecState* state, EncodedJSValue thisValue, EncodedJSValue encodedValue)
{
- return IDLAttribute<JSTestObj>::set<setJSTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttributeSetter>(*state, thisValue, encodedValue, "withScriptExecutionContextAndScriptStateWithSpacesAttribute");
+ return IDLAttribute<JSTestObj>::set<setJSTestObjWithScriptExecutionContextAndExecStateWithSpacesAttributeSetter>(*state, thisValue, encodedValue, "withScriptExecutionContextAndExecStateWithSpacesAttribute");
}
#if ENABLE(Condition1)
@@ -6084,58 +6084,58 @@
return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionRemoveEventListenerBody>(*state, "removeEventListener");
}
-static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionWithScriptStateVoidBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope)
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionWithExecStateVoidBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope)
{
UNUSED_PARAM(state);
UNUSED_PARAM(throwScope);
auto& impl = castedThis->wrapped();
- impl.withScriptStateVoid(*state);
+ impl.withExecStateVoid(*state);
return JSValue::encode(jsUndefined());
}
-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateVoid(ExecState* state)
+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithExecStateVoid(ExecState* state)
{
- return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionWithScriptStateVoidBody>(*state, "withScriptStateVoid");
+ return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionWithExecStateVoidBody>(*state, "withExecStateVoid");
}
-static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionWithScriptStateObjBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope)
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionWithExecStateObjBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope)
{
UNUSED_PARAM(state);
UNUSED_PARAM(throwScope);
auto& impl = castedThis->wrapped();
- return JSValue::encode(toJS<IDLInterface<TestObj>>(*state, *castedThis->globalObject(), impl.withScriptStateObj(*state)));
+ return JSValue::encode(toJS<IDLInterface<TestObj>>(*state, *castedThis->globalObject(), impl.withExecStateObj(*state)));
}
-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateObj(ExecState* state)
+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithExecStateObj(ExecState* state)
{
- return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionWithScriptStateObjBody>(*state, "withScriptStateObj");
+ return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionWithExecStateObjBody>(*state, "withExecStateObj");
}
-static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionWithScriptStateVoidExceptionBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope)
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionWithExecStateVoidExceptionBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope)
{
UNUSED_PARAM(state);
UNUSED_PARAM(throwScope);
auto& impl = castedThis->wrapped();
- propagateException(*state, throwScope, impl.withScriptStateVoidException(*state));
+ propagateException(*state, throwScope, impl.withExecStateVoidException(*state));
return JSValue::encode(jsUndefined());
}
-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateVoidException(ExecState* state)
+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithExecStateVoidException(ExecState* state)
{
- return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionWithScriptStateVoidExceptionBody>(*state, "withScriptStateVoidException");
+ return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionWithExecStateVoidExceptionBody>(*state, "withExecStateVoidException");
}
-static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionWithScriptStateObjExceptionBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope)
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionWithExecStateObjExceptionBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope)
{
UNUSED_PARAM(state);
UNUSED_PARAM(throwScope);
auto& impl = castedThis->wrapped();
- return JSValue::encode(toJS<IDLInterface<TestObj>>(*state, *castedThis->globalObject(), throwScope, impl.withScriptStateObjException(*state)));
+ return JSValue::encode(toJS<IDLInterface<TestObj>>(*state, *castedThis->globalObject(), throwScope, impl.withExecStateObjException(*state)));
}
-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateObjException(ExecState* state)
+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithExecStateObjException(ExecState* state)
{
- return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionWithScriptStateObjExceptionBody>(*state, "withScriptStateObjException");
+ return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionWithExecStateObjExceptionBody>(*state, "withExecStateObjException");
}
static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionWithScriptExecutionContextBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope)
@@ -6155,7 +6155,7 @@
return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionWithScriptExecutionContextBody>(*state, "withScriptExecutionContext");
}
-static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope)
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecStateBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope)
{
UNUSED_PARAM(state);
UNUSED_PARAM(throwScope);
@@ -6163,16 +6163,16 @@
auto* context = jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject())->scriptExecutionContext();
if (UNLIKELY(!context))
return JSValue::encode(jsUndefined());
- impl.withScriptExecutionContextAndScriptState(*state, *context);
+ impl.withScriptExecutionContextAndExecState(*state, *context);
return JSValue::encode(jsUndefined());
}
-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptState(ExecState* state)
+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecState(ExecState* state)
{
- return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateBody>(*state, "withScriptExecutionContextAndScriptState");
+ return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecStateBody>(*state, "withScriptExecutionContextAndExecState");
}
-static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateObjExceptionBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope)
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecStateObjExceptionBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope)
{
UNUSED_PARAM(state);
UNUSED_PARAM(throwScope);
@@ -6180,15 +6180,15 @@
auto* context = jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject())->scriptExecutionContext();
if (UNLIKELY(!context))
return JSValue::encode(jsUndefined());
- return JSValue::encode(toJS<IDLInterface<TestObj>>(*state, *castedThis->globalObject(), throwScope, impl.withScriptExecutionContextAndScriptStateObjException(*state, *context)));
+ return JSValue::encode(toJS<IDLInterface<TestObj>>(*state, *castedThis->globalObject(), throwScope, impl.withScriptExecutionContextAndExecStateObjException(*state, *context)));
}
-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateObjException(ExecState* state)
+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecStateObjException(ExecState* state)
{
- return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateObjExceptionBody>(*state, "withScriptExecutionContextAndScriptStateObjException");
+ return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecStateObjExceptionBody>(*state, "withScriptExecutionContextAndExecStateObjException");
}
-static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateWithSpacesBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope)
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecStateWithSpacesBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope)
{
UNUSED_PARAM(state);
UNUSED_PARAM(throwScope);
@@ -6196,12 +6196,12 @@
auto* context = jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject())->scriptExecutionContext();
if (UNLIKELY(!context))
return JSValue::encode(jsUndefined());
- return JSValue::encode(toJS<IDLInterface<TestObj>>(*state, *castedThis->globalObject(), impl.withScriptExecutionContextAndScriptStateWithSpaces(*state, *context)));
+ return JSValue::encode(toJS<IDLInterface<TestObj>>(*state, *castedThis->globalObject(), impl.withScriptExecutionContextAndExecStateWithSpaces(*state, *context)));
}
-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateWithSpaces(ExecState* state)
+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecStateWithSpaces(ExecState* state)
{
- return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateWithSpacesBody>(*state, "withScriptExecutionContextAndScriptStateWithSpaces");
+ return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionWithScriptExecutionContextAndExecStateWithSpacesBody>(*state, "withScriptExecutionContextAndExecStateWithSpaces");
}
static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionWithDocumentArgumentBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope)
Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (237716 => 237717)
--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -192,23 +192,23 @@
[ImplementedAs=onfoo] attribute EventHandler onwebkitfoo;
// 'CallWith' extended attribute
- [CallWith=ScriptState] void withScriptStateVoid();
- [CallWith=ScriptState] TestObj withScriptStateObj();
- [CallWith=ScriptState, MayThrowException] void withScriptStateVoidException();
- [CallWith=ScriptState, MayThrowException] TestObj withScriptStateObjException();
+ [CallWith=ExecState] void withExecStateVoid();
+ [CallWith=ExecState] TestObj withExecStateObj();
+ [CallWith=ExecState, MayThrowException] void withExecStateVoidException();
+ [CallWith=ExecState, MayThrowException] TestObj withExecStateObjException();
[CallWith=ScriptExecutionContext] void withScriptExecutionContext();
- [CallWith=ScriptExecutionContext&ScriptState] void withScriptExecutionContextAndScriptState();
- [CallWith=ScriptExecutionContext&ScriptState, MayThrowException] TestObj withScriptExecutionContextAndScriptStateObjException();
- [CallWith= ScriptExecutionContext & ScriptState ] TestObj withScriptExecutionContextAndScriptStateWithSpaces();
+ [CallWith=ScriptExecutionContext&ExecState] void withScriptExecutionContextAndExecState();
+ [CallWith=ScriptExecutionContext&ExecState, MayThrowException] TestObj withScriptExecutionContextAndExecStateObjException();
+ [CallWith= ScriptExecutionContext & ExecState ] TestObj withScriptExecutionContextAndExecStateWithSpaces();
[CallWith=Document] void withDocumentArgument();
[CallWith=IncumbentDocument] void withCallerDocumentArgument();
[CallWith=IncumbentWindow] void withCallerWindowArgument();
- [CallWith=ScriptState] attribute long withScriptStateAttribute;
- [CallWith=ScriptState, SetterCallWith=ActiveWindow&FirstWindow] attribute long withCallWithAndSetterCallWithAttribute;
+ [CallWith=ExecState] attribute long withExecStateAttribute;
+ [CallWith=ExecState, SetterCallWith=ActiveWindow&FirstWindow] attribute long withCallWithAndSetterCallWithAttribute;
[CallWith=ScriptExecutionContext] attribute TestObj withScriptExecutionContextAttribute;
- [CallWith=ScriptExecutionContext&ScriptState] attribute TestObj withScriptExecutionContextAndScriptStateAttribute;
- [CallWith= ScriptExecutionContext & ScriptState ] attribute TestObj withScriptExecutionContextAndScriptStateWithSpacesAttribute;
+ [CallWith=ScriptExecutionContext&ExecState] attribute TestObj withScriptExecutionContextAndExecStateAttribute;
+ [CallWith= ScriptExecutionContext & ExecState ] attribute TestObj withScriptExecutionContextAndExecStateWithSpacesAttribute;
// Optional parameters.
void methodWithOptionalArg(optional long opt);
Modified: trunk/Source/WebCore/bindings/scripts/test/TestPromiseRejectionEvent.idl (237716 => 237717)
--- trunk/Source/WebCore/bindings/scripts/test/TestPromiseRejectionEvent.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/bindings/scripts/test/TestPromiseRejectionEvent.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -25,7 +25,7 @@
[
Constructor(DOMString type, TestPromiseRejectionEventInit eventInitDict),
- ConstructorCallWith=ScriptState,
+ ConstructorCallWith=ExecState,
Exposed=(Window,Worker),
] interface TestPromiseRejectionEvent : Event {
readonly attribute Promise<any> promise;
Modified: trunk/Source/WebCore/crypto/SubtleCrypto.idl (237716 => 237717)
--- trunk/Source/WebCore/crypto/SubtleCrypto.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/crypto/SubtleCrypto.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -32,16 +32,16 @@
Exposed=(Window,Worker),
GenerateIsReachable=ImplScriptExecutionContext,
] interface SubtleCrypto {
- [CallWith=ScriptState] Promise<any> encrypt(AlgorithmIdentifier algorithm, CryptoKey key, BufferSource data);
- [CallWith=ScriptState] Promise<any> decrypt(AlgorithmIdentifier algorithm, CryptoKey key, BufferSource data);
- [CallWith=ScriptState] Promise<any> sign(AlgorithmIdentifier algorithm, CryptoKey key, BufferSource data);
- [CallWith=ScriptState] Promise<any> verify(AlgorithmIdentifier algorithm, CryptoKey key, BufferSource signature, BufferSource data);
- [CallWith=ScriptState] Promise<any> digest(AlgorithmIdentifier algorithm, BufferSource data);
- [CallWith=ScriptState] Promise<any> generateKey(AlgorithmIdentifier algorithm, boolean extractable, sequence<CryptoKeyUsage> keyUsages);
- [CallWith=ScriptState] Promise<any> deriveKey(AlgorithmIdentifier algorithm, CryptoKey baseKey, AlgorithmIdentifier derivedKeyType, boolean extractable, sequence<CryptoKeyUsage> keyUsages);
- [CallWith=ScriptState] Promise<ArrayBuffer> deriveBits(AlgorithmIdentifier algorithm, CryptoKey baseKey, unsigned long length);
- [CallWith=ScriptState] Promise<CryptoKey> importKey(KeyFormat format, (BufferSource or JsonWebKey) keyData, AlgorithmIdentifier algorithm, boolean extractable, sequence<CryptoKeyUsage> keyUsages);
+ [CallWith=ExecState] Promise<any> encrypt(AlgorithmIdentifier algorithm, CryptoKey key, BufferSource data);
+ [CallWith=ExecState] Promise<any> decrypt(AlgorithmIdentifier algorithm, CryptoKey key, BufferSource data);
+ [CallWith=ExecState] Promise<any> sign(AlgorithmIdentifier algorithm, CryptoKey key, BufferSource data);
+ [CallWith=ExecState] Promise<any> verify(AlgorithmIdentifier algorithm, CryptoKey key, BufferSource signature, BufferSource data);
+ [CallWith=ExecState] Promise<any> digest(AlgorithmIdentifier algorithm, BufferSource data);
+ [CallWith=ExecState] Promise<any> generateKey(AlgorithmIdentifier algorithm, boolean extractable, sequence<CryptoKeyUsage> keyUsages);
+ [CallWith=ExecState] Promise<any> deriveKey(AlgorithmIdentifier algorithm, CryptoKey baseKey, AlgorithmIdentifier derivedKeyType, boolean extractable, sequence<CryptoKeyUsage> keyUsages);
+ [CallWith=ExecState] Promise<ArrayBuffer> deriveBits(AlgorithmIdentifier algorithm, CryptoKey baseKey, unsigned long length);
+ [CallWith=ExecState] Promise<CryptoKey> importKey(KeyFormat format, (BufferSource or JsonWebKey) keyData, AlgorithmIdentifier algorithm, boolean extractable, sequence<CryptoKeyUsage> keyUsages);
Promise<any> exportKey(KeyFormat format, CryptoKey key);
- [CallWith=ScriptState] Promise<any> wrapKey(KeyFormat format, CryptoKey key, CryptoKey wrappingKey, AlgorithmIdentifier wrapAlgorithm);
- [CallWith=ScriptState] Promise<CryptoKey> unwrapKey(KeyFormat format, BufferSource wrappedKey, CryptoKey unwrappingKey, AlgorithmIdentifier unwrapAlgorithm, AlgorithmIdentifier unwrappedKeyAlgorithm, boolean extractable, sequence<CryptoKeyUsage> keyUsages);
+ [CallWith=ExecState] Promise<any> wrapKey(KeyFormat format, CryptoKey key, CryptoKey wrappingKey, AlgorithmIdentifier wrapAlgorithm);
+ [CallWith=ExecState] Promise<CryptoKey> unwrapKey(KeyFormat format, BufferSource wrappedKey, CryptoKey unwrappingKey, AlgorithmIdentifier unwrapAlgorithm, AlgorithmIdentifier unwrappedKeyAlgorithm, boolean extractable, sequence<CryptoKeyUsage> keyUsages);
};
Modified: trunk/Source/WebCore/dom/Element.idl (237716 => 237717)
--- trunk/Source/WebCore/dom/Element.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/dom/Element.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -55,7 +55,7 @@
[CEReactions, MayThrowException] Attr removeAttributeNode(Attr attr);
[EnabledAtRuntime=ShadowDOM, MayThrowException] ShadowRoot attachShadow(ShadowRootInit init);
- [EnabledAtRuntime=ShadowDOM, ImplementedAs=shadowRootForBindings, CallWith=ScriptState] readonly attribute ShadowRoot? shadowRoot;
+ [EnabledAtRuntime=ShadowDOM, ImplementedAs=shadowRootForBindings, CallWith=ExecState] readonly attribute ShadowRoot? shadowRoot;
[MayThrowException] Element? closest(DOMString selectors);
[MayThrowException] boolean matches(DOMString selectors);
Modified: trunk/Source/WebCore/dom/ErrorEvent.idl (237716 => 237717)
--- trunk/Source/WebCore/dom/ErrorEvent.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/dom/ErrorEvent.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -38,7 +38,7 @@
readonly attribute USVString filename;
readonly attribute unsigned long lineno;
readonly attribute unsigned long colno;
- [CallWith=ScriptState&GlobalObject] readonly attribute any error;
+ [CallWith=ExecState&GlobalObject] readonly attribute any error;
};
dictionary ErrorEventInit : EventInit {
Modified: trunk/Source/WebCore/dom/MessagePort.idl (237716 => 237717)
--- trunk/Source/WebCore/dom/MessagePort.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/dom/MessagePort.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -31,7 +31,7 @@
GenerateIsReachable=Impl,
JSCustomMarkFunction,
] interface MessagePort : EventTarget {
- [CallWith=ScriptState, MayThrowException] void postMessage(any message, optional sequence<object> transfer = []);
+ [CallWith=ExecState, MayThrowException] void postMessage(any message, optional sequence<object> transfer = []);
void start();
void close();
Modified: trunk/Source/WebCore/dom/MouseEvent.idl (237716 => 237717)
--- trunk/Source/WebCore/dom/MouseEvent.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/dom/MouseEvent.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -44,7 +44,7 @@
// FIXME: Using "undefined" as default parameter value is wrong.
// FIXME: relatedTarget should be of type EventTarget? but we need to use any to support a quirk for iAd Producer (rdar://problem/30640101).
- [CallWith=ScriptState&ScriptExecutionContext, ImplementedAs=initMouseEventQuirk] void initMouseEvent(optional DOMString type = "undefined",
+ [CallWith=ExecState&ScriptExecutionContext, ImplementedAs=initMouseEventQuirk] void initMouseEvent(optional DOMString type = "undefined",
optional boolean canBubble = false, optional boolean cancelable = false,
optional WindowProxy? view = null, optional long detail = 0,
optional long screenX = 0, optional long screenY = 0, optional long clientX = 0, optional long clientY = 0,
Modified: trunk/Source/WebCore/html/HTMLCanvasElement.idl (237716 => 237717)
--- trunk/Source/WebCore/html/HTMLCanvasElement.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -48,7 +48,7 @@
attribute unsigned long width;
attribute unsigned long height;
- [CallWith=ScriptState, MayThrowException] RenderingContext? getContext(DOMString contextId, any... arguments);
+ [CallWith=ExecState, MayThrowException] RenderingContext? getContext(DOMString contextId, any... arguments);
[MayThrowException] DOMString toDataURL(optional DOMString type, optional any quality);
[CallWith=ScriptExecutionContext, MayThrowException] void toBlob(BlobCallback callback, optional DOMString type, optional any quality);
Modified: trunk/Source/WebCore/html/HTMLFrameElement.idl (237716 => 237717)
--- trunk/Source/WebCore/html/HTMLFrameElement.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/html/HTMLFrameElement.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -37,5 +37,5 @@
readonly attribute long height;
// FIXME: No other browser has this attribute.
- [SetterCallWith=ScriptState] attribute DOMString? location;
+ [SetterCallWith=ExecState] attribute DOMString? location;
};
Modified: trunk/Source/WebCore/html/OffscreenCanvas.idl (237716 => 237717)
--- trunk/Source/WebCore/html/OffscreenCanvas.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/html/OffscreenCanvas.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -47,7 +47,7 @@
attribute [EnforceRange] unsigned long width;
attribute [EnforceRange] unsigned long height;
- [CallWith=ScriptState, MayThrowException, Conditional=WEBGL] WebGLRenderingContext? getContext(OffscreenRenderingContextType contextType, any... arguments);
+ [CallWith=ExecState, MayThrowException, Conditional=WEBGL] WebGLRenderingContext? getContext(OffscreenRenderingContextType contextType, any... arguments);
ImageBitmap transferToImageBitmap();
// Promise<Blob> convertToBlob(optional ImageEncodeOptions options);
Modified: trunk/Source/WebCore/html/track/DataCue.idl (237716 => 237717)
--- trunk/Source/WebCore/html/track/DataCue.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/html/track/DataCue.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -33,6 +33,6 @@
attribute ArrayBuffer data;
// Proposed extensions.
- [CallWith=ScriptState] attribute any value;
+ [CallWith=ExecState] attribute any value;
readonly attribute DOMString type;
};
Modified: trunk/Source/WebCore/inspector/CommandLineAPIHost.idl (237716 => 237717)
--- trunk/Source/WebCore/inspector/CommandLineAPIHost.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/inspector/CommandLineAPIHost.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -37,10 +37,10 @@
void clearConsoleMessages();
void copyText(DOMString text);
- [CallWith=ScriptState] void inspect(any objectToInspect, any hints);
- [CallWith=ScriptState] any inspectedObject();
+ [CallWith=ExecState] void inspect(any objectToInspect, any hints);
+ [CallWith=ExecState] any inspectedObject();
- [CallWith=ScriptState] record<DOMString, sequence<ListenerEntry>> getEventListeners(Node? node);
+ [CallWith=ExecState] record<DOMString, sequence<ListenerEntry>> getEventListeners(Node? node);
DOMString databaseId(Database database);
DOMString storageId(Storage storage);
Modified: trunk/Source/WebCore/page/DOMWindow.idl (237716 => 237717)
--- trunk/Source/WebCore/page/DOMWindow.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -93,7 +93,7 @@
long requestAnimationFrame(RequestAnimationFrameCallback callback); // FIXME: Should return an unsigned long.
void cancelAnimationFrame(long handle); // FIXME: handle should be an unsigned long.
- [CallWith=ScriptState&IncumbentWindow, DoNotCheckSecurity, ForwardDeclareInHeader, MayThrowException] void postMessage(any message, USVString targetOrigin, optional sequence<object> transfer = []);
+ [CallWith=ExecState&IncumbentWindow, DoNotCheckSecurity, ForwardDeclareInHeader, MayThrowException] void postMessage(any message, USVString targetOrigin, optional sequence<object> transfer = []);
// Obsolete members, still part of the HTML specification (https://html.spec.whatwg.org/#Window-partial).
void captureEvents(); // Not implemented. Also not in modern standards. Empty function may help compatibility with legacy content.
Modified: trunk/Source/WebCore/page/RemoteDOMWindow.idl (237716 => 237717)
--- trunk/Source/WebCore/page/RemoteDOMWindow.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/page/RemoteDOMWindow.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -55,5 +55,5 @@
[Unforgeable] readonly attribute WindowProxy? top;
readonly attribute WindowProxy? opener;
[Replaceable] readonly attribute WindowProxy? parent;
- [CallWith=ScriptState&IncumbentWindow, ForwardDeclareInHeader] void postMessage(any message, USVString targetOrigin, optional sequence<object> transfer = []);
+ [CallWith=ExecState&IncumbentWindow, ForwardDeclareInHeader] void postMessage(any message, USVString targetOrigin, optional sequence<object> transfer = []);
};
Modified: trunk/Source/WebCore/page/WindowOrWorkerGlobalScope.idl (237716 => 237717)
--- trunk/Source/WebCore/page/WindowOrWorkerGlobalScope.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/page/WindowOrWorkerGlobalScope.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -40,10 +40,10 @@
// Timers
// FIXME: This should take a TimerHandler (a.k.a. (DOMString or Function)) rather than a ScheduledAction.
- [CallWith=ScriptState, MayThrowException] long setTimeout(ScheduledAction handler, optional long timeout = 0, any... arguments);
+ [CallWith=ExecState, MayThrowException] long setTimeout(ScheduledAction handler, optional long timeout = 0, any... arguments);
void clearTimeout(optional long handle = 0);
// FIXME: This should take a TimerHandler (a.k.a. (DOMString or Function)) rather than a ScheduledAction.
- [CallWith=ScriptState, MayThrowException] long setInterval(ScheduledAction handler, optional long timeout = 0, any... arguments);
+ [CallWith=ExecState, MayThrowException] long setInterval(ScheduledAction handler, optional long timeout = 0, any... arguments);
void clearInterval(optional long handle = 0);
[Custom] void queueMicrotask(VoidCallback callback);
Modified: trunk/Source/WebCore/testing/Internals.idl (237716 => 237717)
--- trunk/Source/WebCore/testing/Internals.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/testing/Internals.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -605,8 +605,8 @@
void setShowAllPlugins(boolean showAll);
- [Conditional=STREAMS_API, CallWith=ScriptState] any cloneArrayBuffer(any buffer, any srcByteOffset, any byteLength);
- [Conditional=STREAMS_API, CallWith=ScriptState] boolean isReadableStreamDisturbed(any stream);
+ [Conditional=STREAMS_API, CallWith=ExecState] any cloneArrayBuffer(any buffer, any srcByteOffset, any byteLength);
+ [Conditional=STREAMS_API, CallWith=ExecState] boolean isReadableStreamDisturbed(any stream);
DOMString resourceLoadStatisticsForOrigin(DOMString domain);
void setResourceLoadStatisticsEnabled(boolean enable);
Modified: trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.idl (237716 => 237717)
--- trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -39,7 +39,7 @@
] interface DedicatedWorkerGlobalScope : WorkerGlobalScope {
[Replaceable] readonly attribute DOMString name;
- [CallWith=ScriptState, MayThrowException] void postMessage(any message, optional sequence<object> transfer = []);
+ [CallWith=ExecState, MayThrowException] void postMessage(any message, optional sequence<object> transfer = []);
void close();
Modified: trunk/Source/WebCore/workers/Worker.idl (237716 => 237717)
--- trunk/Source/WebCore/workers/Worker.idl 2018-11-02 02:04:26 UTC (rev 237716)
+++ trunk/Source/WebCore/workers/Worker.idl 2018-11-02 03:35:57 UTC (rev 237717)
@@ -32,7 +32,7 @@
] interface Worker : EventTarget {
void terminate();
- [CallWith=ScriptState, MayThrowException] void postMessage(any message, optional sequence<object> transfer = []);
+ [CallWith=ExecState, MayThrowException] void postMessage(any message, optional sequence<object> transfer = []);
attribute EventHandler onmessage;
};
