[api] Fully deprecated WrapperDescriptor

mlippautz · V8 LUCI CQ · commit d40595e47174 · 2024-05-13T14:13:10.000Z
Bug: 338411141 Change-Id: I76f7f964dad58cbed7eccca139200d27c320950d Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5526611 Reviewed-by: Dominik Inführ <dinfuehr@chromium.org> Commit-Queue: Michael Lippautz <mlippautz@chromium.org> Cr-Commit-Position: refs/heads/main@{#93859}
diff --git a/include/v8-cppgc.h b/include/v8-cppgc.h
@@ -50,10 +50,10 @@ struct WrapperDescriptor final {
    */
   static constexpr uint16_t kUnknownEmbedderId = UINT16_MAX;
 
-  V8_DEPRECATE_SOON("WrapperDescriptor is deprecated, see crbug.com/338411141.")
+  V8_DEPRECATED("WrapperDescriptor is deprecated, see crbug.com/338411141.")
   constexpr WrapperDescriptor() = default;
 
-  V8_DEPRECATE_SOON("WrapperDescriptor is deprecated, see crbug.com/338411141.")
+  V8_DEPRECATED("WrapperDescriptor is deprecated, see crbug.com/338411141.")
   constexpr WrapperDescriptor(InternalFieldIndex wrappable_type_index,
                               InternalFieldIndex wrappable_instance_index,
                               uint16_t embedder_id_for_garbage_collected)
@@ -87,7 +87,7 @@ struct V8_EXPORT CppHeapCreateParams {
       : custom_spaces(std::move(custom_spaces)) {}
   END_ALLOW_USE_DEPRECATED()
 
-  V8_DEPRECATE_SOON("WrapperDescriptor is deprecated, see crbug.com/338411141.")
+  V8_DEPRECATED("WrapperDescriptor is deprecated, see crbug.com/338411141.")
   CppHeapCreateParams(
       std::vector<std::unique_ptr<cppgc::CustomSpaceBase>> custom_spaces,
       WrapperDescriptor wrapper_descriptor)
@@ -191,6 +191,7 @@ class V8_EXPORT CppHeap {
   /**
    * \returns the wrapper descriptor of this CppHeap.
    */
+  V8_DEPRECATED("WrapperDescriptor is deprecated, see crbug.com/338411141.")
   v8::WrapperDescriptor wrapper_descriptor() const;
 
  private:
diff --git a/test/unittests/heap/cppgc-js/unified-heap-snapshot-unittest.cc b/test/unittests/heap/cppgc-js/unified-heap-snapshot-unittest.cc
@@ -718,7 +718,9 @@ class WrappedContext : public cppgc::GarbageCollected<WrappedContext>,
 
 TEST_F(UnifiedHeapSnapshotTest, WrappedContext) {
   JsTestingScope testing_scope(v8_isolate());
+  START_ALLOW_USE_DEPRECATED()
   v8::WrapperDescriptor desc = v8_isolate()->GetCppHeap()->wrapper_descriptor();
+  END_ALLOW_USE_DEPRECATED()
   v8_isolate()->GetHeapProfiler()->SetGetDetachednessCallback(
       WrappedContext::GetDetachedness, &desc);
   cppgc::Persistent<WrappedContext> wrapped = WrappedContext::New(v8_isolate());
diff --git a/test/unittests/heap/cppgc-js/unified-heap-unittest.cc b/test/unittests/heap/cppgc-js/unified-heap-unittest.cc
@@ -762,8 +762,10 @@ TEST_F(UnifiedHeapTest, WrapperDescriptorGetter) {
   v8::Isolate* isolate = v8_isolate();
   auto* wrappable_object =
       cppgc::MakeGarbageCollected<Wrappable2>(allocation_handle());
+  START_ALLOW_USE_DEPRECATED()
   v8::WrapperDescriptor descriptor =
       isolate->GetCppHeap()->wrapper_descriptor();
+  END_ALLOW_USE_DEPRECATED()
   v8::Local<v8::ObjectTemplate> tmpl = v8::ObjectTemplate::New(isolate);
   int size = std::max(descriptor.wrappable_type_index,
                       descriptor.wrappable_instance_index) +
