Replace ScopedPersistent in V8V0CustomElementLifecycleCallbacks with TraceWrapperV8Reference

Replace ScopedPersistent in V8V0CustomElementLifecycleCallbacks with TraceWrapperV8Reference.
Use of ScopedPersistent is discourage in favour of TraceWrapperV8Reference which is GC aware.

Bug: 1013149
Change-Id: I3b45f15616d2b206d260f45519546e845a183c5d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1855321
Commit-Queue: Keishi Hattori <keishi@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Yuki Shiino <yukishiino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705073}

third_party/blink/renderer/bindings/core/v8/v8_v0_custom_element_lifecycle_callbacks.cc

@@ -106,19 +106,15 @@ V8V0CustomElementLifecycleCallbacks::V8V0CustomElementLifecycleCallbacks(
     : V0CustomElementLifecycleCallbacks(
           FlagSet(attached, detached, attribute_changed)),
       script_state_(script_state),
-      prototype_(script_state->GetIsolate(), prototype),
-      created_(script_state->GetIsolate(), created),
-      attached_(script_state->GetIsolate(), attached),
-      detached_(script_state->GetIsolate(), detached),
-      attribute_changed_(script_state->GetIsolate(), attribute_changed) {
-  prototype_.SetPhantom();
-
-#define MAKE_WEAK(Var, Ignored) \
-  if (!Var##_.IsEmpty())        \
-    Var##_.SetPhantom();
-
-  CALLBACK_LIST(MAKE_WEAK)
-#undef MAKE_WEAK
+      prototype_(script_state->GetIsolate(), prototype){
+  v8::Isolate* isolate = script_state->GetIsolate();
+  v8::Local<v8::Function> function;
+#define SET_FIELD(maybe, ignored)    \
+  if (maybe.ToLocal(&function))      \
+    maybe##_.Set(isolate, function);
+
+  CALLBACK_LIST(SET_FIELD)
+#undef SET_FIELD
 }
 
 V8PerContextData* V8V0CustomElementLifecycleCallbacks::CreationContextData() {
@@ -228,7 +224,7 @@ void V8V0CustomElementLifecycleCallbacks::AttributeChanged(
 }
 
 void V8V0CustomElementLifecycleCallbacks::Call(
-    const ScopedPersistent<v8::Function>& weak_callback,
+    const TraceWrapperV8Reference<v8::Function>& callback_reference,
     Element* element) {
   // FIXME: callbacks while paused should be queued up for execution to
   // continue then be delivered in order rather than delivered immediately.
@@ -238,7 +234,7 @@ void V8V0CustomElementLifecycleCallbacks::Call(
   ScriptState::Scope scope(script_state_);
   v8::Isolate* isolate = script_state_->GetIsolate();
   v8::Local<v8::Context> context = script_state_->GetContext();
-  v8::Local<v8::Function> callback = weak_callback.NewLocal(isolate);
+  v8::Local<v8::Function> callback = callback_reference.NewLocal(isolate);
   if (callback.IsEmpty())
     return;
 
@@ -254,6 +250,11 @@ void V8V0CustomElementLifecycleCallbacks::Call(
 
 void V8V0CustomElementLifecycleCallbacks::Trace(blink::Visitor* visitor) {
   visitor->Trace(script_state_);
+  visitor->Trace(prototype_);
+  visitor->Trace(created_);
+  visitor->Trace(attached_);
+  visitor->Trace(detached_);
+  visitor->Trace(attribute_changed_);
   V0CustomElementLifecycleCallbacks::Trace(visitor);
 }
 

third_party/blink/renderer/bindings/core/v8/v8_v0_custom_element_lifecycle_callbacks.h

@@ -35,8 +35,8 @@
 
 #include "base/memory/scoped_refptr.h"
 #include "third_party/blink/renderer/core/html/custom/v0_custom_element_lifecycle_callbacks.h"
-#include "third_party/blink/renderer/platform/bindings/scoped_persistent.h"
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
+#include "third_party/blink/renderer/platform/bindings/trace_wrapper_v8_reference.h"
 #include "v8/include/v8.h"
 
 namespace blink {
@@ -79,16 +79,17 @@ class V8V0CustomElementLifecycleCallbacks final
                         const AtomicString& old_value,
                         const AtomicString& new_value) override;
 
-  void Call(const ScopedPersistent<v8::Function>& weak_callback, Element*);
+  void Call(const TraceWrapperV8Reference<v8::Function>& callback_reference,
+            Element*);
 
   V8PerContextData* CreationContextData();
 
   Member<ScriptState> script_state_;
-  ScopedPersistent<v8::Object> prototype_;
-  ScopedPersistent<v8::Function> created_;
-  ScopedPersistent<v8::Function> attached_;
-  ScopedPersistent<v8::Function> detached_;
-  ScopedPersistent<v8::Function> attribute_changed_;
+  TraceWrapperV8Reference<v8::Object> prototype_;
+  TraceWrapperV8Reference<v8::Function> created_;
+  TraceWrapperV8Reference<v8::Function> attached_;
+  TraceWrapperV8Reference<v8::Function> detached_;
+  TraceWrapperV8Reference<v8::Function> attribute_changed_;
 };
 
 }  // namespace blink