[api][cleanup] Deprecate SetAccessor and SetNativeDataProperty

isheludko · V8 LUCI CQ · commit 6ec883986bd4 · 2024-03-22T15:48:40.000Z
... which were marked as V8_DEPRECATE_SOON in 12.1 and 12.4. This CL deprecates v8::Template::SetNativeDataProperty(v8::Local<v8::String>, ...); v8::ObjectTemplate::SetAccessor(v8::Local<v8::String>, ...); and v8::Template::SetNativeDataProperty(...); with AccessControl parameter. Additionally, the CL marks the following typedefs as V8_DEPRECATE_SOON v8::AccessorGetterCallback, v8::AccessorSetterCallback. Bug: chromium:326505377 Change-Id: If6f30b3aba9f55785c573faf4a307c6de0d175ab Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5383482 Reviewed-by: Toon Verwaest <verwaest@chromium.org> Commit-Queue: Igor Sheludko <ishell@chromium.org> Cr-Commit-Position: refs/heads/main@{#92974}
diff --git a/include/v8-object.h b/include/v8-object.h
@@ -146,18 +146,20 @@ enum PropertyAttribute {
 };
 
 /**
- * Accessor[Getter|Setter] are used as callback functions when
- * setting|getting a particular property. See Object and ObjectTemplate's
- * method SetAccessor.
+ * Accessor[Getter|Setter] are used as callback functions when setting|getting
+ * a particular data property. See Object::SetNativeDataProperty and
+ * ObjectTemplate::SetNativeDataProperty methods.
  */
-using AccessorGetterCallback =
+using AccessorGetterCallback V8_DEPRECATE_SOON(
+    "Use AccessorNameGetterCallback signature instead") =
     void (*)(Local<String> property, const PropertyCallbackInfo<Value>& info);
 using AccessorNameGetterCallback =
     void (*)(Local<Name> property, const PropertyCallbackInfo<Value>& info);
 
-using AccessorSetterCallback = void (*)(Local<String> property,
-                                        Local<Value> value,
-                                        const PropertyCallbackInfo<void>& info);
+using AccessorSetterCallback V8_DEPRECATE_SOON(
+    "Use AccessorNameSetterCallback signature instead") =
+    void (*)(Local<String> property, Local<Value> value,
+             const PropertyCallbackInfo<void>& info);
 using AccessorNameSetterCallback =
     void (*)(Local<Name> property, Local<Value> value,
              const PropertyCallbackInfo<void>& info);
diff --git a/include/v8-template.h b/include/v8-template.h
@@ -80,21 +80,21 @@ class V8_EXPORT Template : public Data {
    * \param attribute The attributes of the property for which an accessor
    *   is added.
    */
-  V8_DEPRECATE_SOON("Use SetNativeDataProperty without AccessControl instead")
+  V8_DEPRECATED("Use SetNativeDataProperty without AccessControl instead")
   void SetNativeDataProperty(
       Local<String> name, AccessorGetterCallback getter,
       AccessorSetterCallback setter, Local<Value> data,
       PropertyAttribute attribute, AccessControl settings,
       SideEffectType getter_side_effect_type = SideEffectType::kHasSideEffect,
       SideEffectType setter_side_effect_type = SideEffectType::kHasSideEffect);
-  V8_DEPRECATE_SOON("Use SetNativeDataProperty without AccessControl instead")
+  V8_DEPRECATED("Use SetNativeDataProperty without AccessControl instead")
   void SetNativeDataProperty(
       Local<Name> name, AccessorNameGetterCallback getter,
       AccessorNameSetterCallback setter, Local<Value> data,
       PropertyAttribute attribute, AccessControl settings,
       SideEffectType getter_side_effect_type = SideEffectType::kHasSideEffect,
       SideEffectType setter_side_effect_type = SideEffectType::kHasSideEffect);
-  V8_DEPRECATE_SOON("Use SetNativeDataProperty with Local<Name> instead")
+  V8_DEPRECATED("Use SetNativeDataProperty with Local<Name> instead")
   void SetNativeDataProperty(
       Local<String> name, AccessorGetterCallback getter,
       AccessorSetterCallback setter = nullptr,
@@ -1063,7 +1063,7 @@ class V8_EXPORT ObjectTemplate : public Template {
    * \param attribute The attributes of the property for which an accessor
    *   is added.
    */
-  V8_DEPRECATE_SOON("Use SetAccessor with Local<Name> instead")
+  V8_DEPRECATED("Use SetAccessor with Local<Name> instead")
   void SetAccessor(
       Local<String> name, AccessorGetterCallback getter,
       AccessorSetterCallback setter = nullptr,
