cppgc: avoid multiple class declarations

targos · Commit Bot · commit bde7ee5473d6 · 2020-11-30T06:56:38.000Z
ConcurrentMarkingState and MarkingStateBase are already defined in the This change fixes compilation with MSVC. v8: :internal namespace. Change-Id: Ib8a1370a0a27a90e385fd69e61036e263e1489e6 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2562671 Reviewed-by: Omer Katz <omerkatz@chromium.org> Commit-Queue: Michaël Zasso <mic.besace@gmail.com> Cr-Commit-Position: refs/heads/master@{#71473}
diff --git a/src/heap/cppgc-js/cpp-heap.cc b/src/heap/cppgc-js/cpp-heap.cc
@@ -94,15 +94,15 @@ class UnifiedHeapConcurrentMarker
         unified_heap_marking_state_(unified_heap_marking_state) {}
 
   std::unique_ptr<cppgc::Visitor> CreateConcurrentMarkingVisitor(
-      ConcurrentMarkingState&) const final;
+      cppgc::internal::ConcurrentMarkingState&) const final;
 
  private:
   UnifiedHeapMarkingState& unified_heap_marking_state_;
 };
 
 std::unique_ptr<cppgc::Visitor>
 UnifiedHeapConcurrentMarker::CreateConcurrentMarkingVisitor(
-    ConcurrentMarkingState& marking_state) const {
+    cppgc::internal::ConcurrentMarkingState& marking_state) const {
   return std::make_unique<ConcurrentUnifiedHeapMarkingVisitor>(
       heap(), marking_state, unified_heap_marking_state_);
 }
diff --git a/src/heap/cppgc-js/unified-heap-marking-visitor.cc b/src/heap/cppgc-js/unified-heap-marking-visitor.cc
@@ -14,7 +14,7 @@ namespace v8 {
 namespace internal {
 
 UnifiedHeapMarkingVisitorBase::UnifiedHeapMarkingVisitorBase(
-    HeapBase& heap, MarkingStateBase& marking_state,
+    HeapBase& heap, cppgc::internal::MarkingStateBase& marking_state,
     UnifiedHeapMarkingState& unified_heap_marking_state)
     : JSVisitor(cppgc::internal::VisitorFactory::CreateKey()),
       marking_state_(marking_state),
@@ -89,7 +89,7 @@ void MutatorUnifiedHeapMarkingVisitor::VisitWeakRoot(const void* object,
 }
 
 ConcurrentUnifiedHeapMarkingVisitor::ConcurrentUnifiedHeapMarkingVisitor(
-    HeapBase& heap, ConcurrentMarkingState& marking_state,
+    HeapBase& heap, cppgc::internal::ConcurrentMarkingState& marking_state,
     UnifiedHeapMarkingState& unified_heap_marking_state)
     : UnifiedHeapMarkingVisitorBase(heap, marking_state,
                                     unified_heap_marking_state) {}
@@ -99,7 +99,7 @@ bool ConcurrentUnifiedHeapMarkingVisitor::DeferTraceToMutatorThreadIfConcurrent(
     size_t deferred_size) {
   marking_state_.concurrent_marking_bailout_worklist().Push(
       {parameter, callback, deferred_size});
-  static_cast<ConcurrentMarkingState&>(marking_state_)
+  static_cast<cppgc::internal::ConcurrentMarkingState&>(marking_state_)
       .AccountDeferredMarkedBytes(deferred_size);
   return true;
 }
diff --git a/src/heap/cppgc-js/unified-heap-marking-visitor.h b/src/heap/cppgc-js/unified-heap-marking-visitor.h
@@ -28,14 +28,12 @@ namespace internal {
 using cppgc::SourceLocation;
 using cppgc::TraceDescriptor;
 using cppgc::WeakCallback;
-using cppgc::internal::ConcurrentMarkingState;
 using cppgc::internal::HeapBase;
-using cppgc::internal::MarkingStateBase;
 using cppgc::internal::MutatorMarkingState;
 
 class V8_EXPORT_PRIVATE UnifiedHeapMarkingVisitorBase : public JSVisitor {
  public:
-  UnifiedHeapMarkingVisitorBase(HeapBase&, MarkingStateBase&,
+  UnifiedHeapMarkingVisitorBase(HeapBase&, cppgc::internal::MarkingStateBase&,
                                 UnifiedHeapMarkingState&);
   ~UnifiedHeapMarkingVisitorBase() override = default;
 
@@ -53,7 +51,7 @@ class V8_EXPORT_PRIVATE UnifiedHeapMarkingVisitorBase : public JSVisitor {
   // JS handling.
   void Visit(const TracedReferenceBase& ref) final;
 
-  MarkingStateBase& marking_state_;
+  cppgc::internal::MarkingStateBase& marking_state_;
   UnifiedHeapMarkingState& unified_heap_marking_state_;
 };
 
@@ -73,7 +71,8 @@ class V8_EXPORT_PRIVATE MutatorUnifiedHeapMarkingVisitor final
 class V8_EXPORT_PRIVATE ConcurrentUnifiedHeapMarkingVisitor final
     : public UnifiedHeapMarkingVisitorBase {
  public:
-  ConcurrentUnifiedHeapMarkingVisitor(HeapBase&, ConcurrentMarkingState&,
+  ConcurrentUnifiedHeapMarkingVisitor(HeapBase&,
+                                      cppgc::internal::ConcurrentMarkingState&,
                                       UnifiedHeapMarkingState&);
   ~ConcurrentUnifiedHeapMarkingVisitor() override = default;
 
