commit 51cbafa5ba67b164a9cbd5c4d4f8a4cf4c057448
author graouts@webkit.org <graouts@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Jan 27 07:21:34 2022 +0000
committer graouts@webkit.org <graouts@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Jan 27 07:21:34 2022 +0000
tree 0c96cee593d7707d8f66b74c6d90009bb8f9c918
parent b49b4e1b76ba0a98b4d2310ac6bd31f28b7b82a8

[Web Inspector] Update return value name for Animation.requestEffectTarget()
https://bugs.webkit.org/show_bug.cgi?id=235661

Reviewed by Devin Rousso.

Source/JavaScriptCore:

I wrongly assumed the name of the return value was important for backward compatibility when
fixing bug 235234, but it's not, so let's use a better name which doesn't make any particular
assumption on the type.

* inspector/protocol/Animation.json:

Source/WebInspectorUI:

Update the parameter name to match the name used in the protocol.

* UserInterface/Models/Animation.js:
(WI.Animation.prototype.requestEffectTarget):

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

Source/JavaScriptCore/ChangeLog

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 30de437..1664940 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2022-01-26  Antoine Quint  <graouts@webkit.org>
+
+        [Web Inspector] Update return value name for Animation.requestEffectTarget()
+        https://bugs.webkit.org/show_bug.cgi?id=235661
+
+        Reviewed by Devin Rousso.
+
+        I wrongly assumed the name of the return value was important for backward compatibility when
+        fixing bug 235234, but it's not, so let's use a better name which doesn't make any particular
+        assumption on the type.
+
+        * inspector/protocol/Animation.json:
+
 2022-01-26  Ross Kirsling  <ross.kirsling@sony.com>
 
         Move leftover JSValue inlines from JSString.h to JSCJSValueInlines.h

Source/JavaScriptCore/inspector/protocol/Animation.json

diff --git a/Source/JavaScriptCore/inspector/protocol/Animation.json b/Source/JavaScriptCore/inspector/protocol/Animation.json
index 78b1c37..2e9e8c7 100644
--- a/Source/JavaScriptCore/inspector/protocol/Animation.json
+++ b/Source/JavaScriptCore/inspector/protocol/Animation.json
@@ -88,7 +88,7 @@
                 { "name": "animationId", "$ref": "AnimationId" }
             ],
             "returns": [
-                { "name": "nodeId", "$ref": "DOM.Styleable" }
+                { "name": "effectTarget", "$ref": "DOM.Styleable" }
             ]
         },
         {

Source/WebInspectorUI/ChangeLog

diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
index 898e114..571a880 100644
--- a/Source/WebInspectorUI/ChangeLog
+++ b/Source/WebInspectorUI/ChangeLog
@@ -1,5 +1,17 @@
 2022-01-26  Antoine Quint  <graouts@webkit.org>
 
+        [Web Inspector] Update return value name for Animation.requestEffectTarget()
+        https://bugs.webkit.org/show_bug.cgi?id=235661
+
+        Reviewed by Devin Rousso.
+
+        Update the parameter name to match the name used in the protocol.
+
+        * UserInterface/Models/Animation.js:
+        (WI.Animation.prototype.requestEffectTarget):
+
+2022-01-26  Antoine Quint  <graouts@webkit.org>
+
         [Web Inspector] Graphics tab should display pseudo-elements for more than ::before and ::after
         https://bugs.webkit.org/show_bug.cgi?id=235234
         <rdar://87766777>

Source/WebInspectorUI/UserInterface/Models/Animation.js

diff --git a/Source/WebInspectorUI/UserInterface/Models/Animation.js b/Source/WebInspectorUI/UserInterface/Models/Animation.js
index 7c1b4c9..92d73b9 100644
--- a/Source/WebInspectorUI/UserInterface/Models/Animation.js
+++ b/Source/WebInspectorUI/UserInterface/Models/Animation.js
@@ -191,7 +191,6 @@
         return WI.UIString("Animation %d").format(this._uniqueDisplayNameNumber);
     }
 
-    // COMPATIBILITY (iOS 15): effectTarget changed from DOM.NodeId to CSS.Styleable.
     requestEffectTarget(callback)
     {
         if (this._effectTarget !== undefined) {
@@ -209,12 +208,12 @@
         WI.domManager.ensureDocument();
 
         let target = WI.assumingMainTarget();
-        target.AnimationAgent.requestEffectTarget(this._animationId, (error, styleable) => {
-            // COMPATIBILITY (iOS 15): effectTarget changed from DOM.NodeId to DOM.Styleable.
-            if (!isNaN(styleable))
-                styleable = {nodeId: styleable};
+        target.AnimationAgent.requestEffectTarget(this._animationId, (error, effectTarget) => {
+            // COMPATIBILITY (iOS 15): nodeId was renamed to effectTarget and changed from DOM.NodeId to DOM.Styleable.
+            if (!isNaN(effectTarget))
+                effectTarget = {nodeId: effectTarget};
 
-            this._effectTarget = !error ? WI.DOMStyleable.fromPayload(styleable) : null;
+            this._effectTarget = !error ? WI.DOMStyleable.fromPayload(effectTarget) : null;
 
             for (let requestEffectTargetCallback of this._requestEffectTargetCallbacks)
                 requestEffectTargetCallback(this._effectTarget);