1 files changed, 3 insertions, 103 deletions

diff --git a/chromium/third_party/blink/renderer/platform/bindings/script_wrappable_visitor.h b/chromium/third_party/blink/renderer/platform/bindings/script_wrappable_visitor.h
index 63e83d2bbd1..4caa74fcc81 100644
--- a/chromium/third_party/blink/renderer/platform/bindings/script_wrappable_visitor.h
+++ b/chromium/third_party/blink/renderer/platform/bindings/script_wrappable_visitor.h
@@ -5,102 +5,18 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_BINDINGS_SCRIPT_WRAPPABLE_VISITOR_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_BINDINGS_SCRIPT_WRAPPABLE_VISITOR_H_
 
-#include "third_party/blink/renderer/platform/bindings/trace_wrapper_base.h"
-#include "third_party/blink/renderer/platform/heap/heap_page.h"
-#include "third_party/blink/renderer/platform/heap/threading_traits.h"
 #include "third_party/blink/renderer/platform/heap/visitor.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
-#include "third_party/blink/renderer/platform/wtf/deque.h"
-#include "third_party/blink/renderer/platform/wtf/vector.h"
-#include "v8/include/v8.h"
 
 namespace blink {
 
-template <typename T>
-class DOMWrapperMap;
-class ScriptWrappable;
-class ScriptWrappableVisitor;
-template <typename T>
-class Supplement;
-class TraceWrapperBase;
-class TraceWrapperBaseForSupplement;
-template <typename T>
-class TraceWrapperV8Reference;
-
-#define DEFINE_TRAIT_FOR_TRACE_WRAPPERS(ClassName)                            \
-  template <>                                                                 \
-  inline void TraceTrait<ClassName>::TraceWrappers(                           \
-      ScriptWrappableVisitor* visitor, void* t) {                             \
-    static_assert(sizeof(ClassName), "type needs to be defined");             \
-    static_assert(IsGarbageCollectedType<ClassName>::value,                   \
-                  "only objects deriving from GarbageCollected can be used"); \
-    static_cast<ClassName*>(t)->TraceWrappers(visitor);                       \
-  }
-
-// Abstract visitor for wrapper references in a ScriptWrappable.
-// Usage:
-// - Define a derived class that overrides Visit(..) methods.
-// - Create an instance of the derived class: visitor.
-// - Call visitor.DispatchTraceWrappers(traceable).
-// DispatchTraceWrappers will invoke Visit() method for all
-// wrapper references in traceable.
+// Abstract visitor for visiting ScriptWrappable. Inherit from this
+// visitor and implement the remaining Visit*() methods to visit all
+// references related to wrappers.
 class PLATFORM_EXPORT ScriptWrappableVisitor : public Visitor {
  public:
   ScriptWrappableVisitor() : Visitor(ThreadState::Current()) {}
 
-  // Trace all wrappers of |tracable|.
-  //
-  // If you cannot use TraceWrapperMember & the corresponding TraceWrappers()
-  // for some reason (e.g., unions using raw pointers), see
-  // |TraceWrappersWithManualWriteBarrier()| below.
-  template <typename T>
-  void TraceWrappers(const TraceWrapperMember<T>& traceable) {
-    static_assert(sizeof(T), "T must be fully defined");
-    Visit(traceable.Get());
-  }
-
-  // Enable partial tracing of objects. This is used when tracing interior
-  // objects without their own header.
-  template <typename T>
-  void TraceWrappers(const T& traceable) {
-    static_assert(sizeof(T), "T must be fully defined");
-    traceable.TraceWrappers(this);
-  }
-
-  // Only called from automatically generated bindings code.
-  template <typename T>
-  void TraceWrappersFromGeneratedCode(const T* traceable) {
-    Visit(traceable);
-  }
-
-  // Require all users of manual write barriers to make this explicit in their
-  // |TraceWrappers| definition. Be sure to add
-  // |ScriptWrappableMarkingVisitor::WriteBarrier(new_value)| after all
-  // assignments to the field. Otherwise, the objects may be collected
-  // prematurely.
-  template <typename T>
-  void TraceWrappersWithManualWriteBarrier(const T* traceable) {
-    Visit(traceable);
-  }
-
-  template <typename V8Type>
-  void TraceWrappers(const TraceWrapperV8Reference<V8Type>& v8reference) {
-    Visit(v8reference.template Cast<v8::Value>());
-  }
-
-  // Trace wrappers in non-main worlds.
-  void TraceWrappers(DOMWrapperMap<ScriptWrappable>*,
-                     const ScriptWrappable* key);
-
-  virtual void DispatchTraceWrappers(TraceWrapperBase*);
-  template <typename T>
-  void DispatchTraceWrappers(Supplement<T>* traceable) {
-    TraceWrapperBaseForSupplement* base = traceable;
-    DispatchTraceWrappersForSupplement(base);
-  }
-  // Catch all handlers needed because of mixins except for Supplement<T>.
-  void DispatchTraceWrappers(const void*) const { CHECK(false); }
-
   // Unused blink::Visitor overrides. Derived visitors should still override
   // the cross-component visitation methods. See Visitor documentation.
   void Visit(void* object, TraceDescriptor desc) final {}
@@ -108,7 +24,6 @@ class PLATFORM_EXPORT ScriptWrappableVisitor : public Visitor {
                  void** object_slot,
                  TraceDescriptor desc,
                  WeakCallback callback) final {}
-  void VisitBackingStoreStrongly(void*, void**, TraceDescriptor) final {}
   void VisitBackingStoreWeakly(void*,
                                void**,
                                TraceDescriptor,
@@ -120,21 +35,6 @@ class PLATFORM_EXPORT ScriptWrappableVisitor : public Visitor {
 
  protected:
   using Visitor::Visit;
-
- private:
-  // Helper method to invoke the virtual Visit method with wrapper descriptor.
-  template <typename T>
-  void Visit(const T* traceable) {
-    static_assert(sizeof(T), "T must be fully defined");
-    if (!traceable)
-      return;
-    Visit(const_cast<T*>(traceable), TraceWrapperDescriptorFor(traceable));
-  }
-
-  // Supplement-specific implementation of DispatchTraceWrappers.  The suffix of
-  // "ForSupplement" is necessary not to make this member function a candidate
-  // of overload resolutions.
-  void DispatchTraceWrappersForSupplement(TraceWrapperBaseForSupplement*);
 };
 
 }  // namespace blink