Adjust placement of non-compaction checks.

third_party/WebKit/Source/platform/heap/Visitor.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 262 matching lines @@
 
   template <typename T, void (T::*method)(Visitor*)>
   void registerWeakMembers(const T* obj) {
     registerWeakMembers(obj, &TraceMethodDelegate<T, method>::trampoline);
   }
 
   void registerWeakMembers(const void* object, WeakCallback callback) {
     Derived::fromHelper(this)->registerWeakMembers(object, object, callback);
   }
 
-  template <typename T>
-  void registerBackingStoreReference(T** slot) {
+  void registerBackingStoreReference(void* slot) {
+    if (getMarkingMode() != VisitorMarkingMode::GlobalMarkingWithCompaction)
+      return;
     Derived::fromHelper(this)->registerMovingObjectReference(
         reinterpret_cast<MovableReference*>(slot));
   }
 
-  template <typename T>
-  void registerBackingStoreCallback(T* backingStore,
+  void registerBackingStoreCallback(void* backingStore,
                                     MovingObjectCallback callback,
                                     void* callbackData) {
+    if (getMarkingMode() != VisitorMarkingMode::GlobalMarkingWithCompaction)
+      return;
     Derived::fromHelper(this)->registerMovingObjectCallback(
         reinterpret_cast<MovableReference>(backingStore), callback,
         callbackData);
   }
 
   inline ThreadState* state() const { return m_state; }
   inline ThreadHeap& heap() const { return state()->heap(); }
 
   inline VisitorMarkingMode getMarkingMode() const { return m_markingMode; }
 
@@ skipping 95 matching lines @@
 
  private:
   static Visitor* fromHelper(VisitorHelper<Visitor>* helper) {
     return static_cast<Visitor*>(helper);
   }
 };
 
 }  // namespace blink
 
 #endif  // Visitor_h