[oilpan] Rename AdjustAndMark to AdjustPointer

Reflects the change that there marking is actually implemented in the
marking visitors and the adjust traits are only used for getting
the proper descriptions.

Bug: chromium:802273
Change-Id: Ib5df76a4689696b766c657fc7676780c694760f0
Reviewed-on: https://chromium-review.googlesource.com/948742
Commit-Queue: Michael Lippautz <mlippautz@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541762}

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

@@ -273,10 +273,10 @@ class GarbageCollectedFinalized : public GarbageCollected<T> {
 template <typename T,
           bool = WTF::IsSubclassOfTemplate<typename std::remove_const<T>::type,
                                            GarbageCollected>::value>
-class NeedsAdjustAndMark;
+class NeedsAdjustPointer;
 
 template <typename T>
-class NeedsAdjustAndMark<T, true> {
+class NeedsAdjustPointer<T, true> {
   static_assert(sizeof(T), "T must be fully defined");
 
  public:
@@ -284,7 +284,7 @@ class NeedsAdjustAndMark<T, true> {
 };
 
 template <typename T>
-class NeedsAdjustAndMark<T, false> {
+class NeedsAdjustPointer<T, false> {
   static_assert(sizeof(T), "T must be fully defined");
 
  public:

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

@@ -99,7 +99,7 @@ class WeakMember;
 template <typename T>
 class UntracedMember;
 
-template <typename T, bool = NeedsAdjustAndMark<T>::value>
+template <typename T, bool = NeedsAdjustPointer<T>::value>
 class ObjectAliveTrait;
 
 template <typename T>

third_party/WebKit/Source/platform/heap/HeapTest.cpp

@@ -4837,23 +4837,23 @@ TEST(HeapTest, MixinInstanceWithoutTrace) {
   EXPECT_LE(saved_trace_count, MixinA::trace_count_);
 }
 
-TEST(HeapTest, NeedsAdjustAndMark) {
+TEST(HeapTest, NeedsAdjustPointer) {
   // class Mixin : public GarbageCollectedMixin {};
-  static_assert(NeedsAdjustAndMark<Mixin>::value,
+  static_assert(NeedsAdjustPointer<Mixin>::value,
                 "A Mixin pointer needs adjustment");
-  static_assert(NeedsAdjustAndMark<Mixin>::value,
+  static_assert(NeedsAdjustPointer<Mixin>::value,
                 "A const Mixin pointer needs adjustment");
 
   // class SimpleObject : public GarbageCollected<SimpleObject> {};
-  static_assert(!NeedsAdjustAndMark<SimpleObject>::value,
+  static_assert(!NeedsAdjustPointer<SimpleObject>::value,
                 "A SimpleObject pointer does not need adjustment");
-  static_assert(!NeedsAdjustAndMark<const SimpleObject>::value,
+  static_assert(!NeedsAdjustPointer<const SimpleObject>::value,
                 "A const SimpleObject pointer does not need adjustment");
 
   // class UseMixin : public SimpleObject, public Mixin {};
-  static_assert(!NeedsAdjustAndMark<UseMixin>::value,
+  static_assert(!NeedsAdjustPointer<UseMixin>::value,
                 "A UseMixin pointer does not need adjustment");
-  static_assert(!NeedsAdjustAndMark<const UseMixin>::value,
+  static_assert(!NeedsAdjustPointer<const UseMixin>::value,
                 "A const UseMixin pointer does not need adjustment");
 }
 

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

@@ -42,12 +42,12 @@ class WeakMember;
 template <typename T>
 class WeakPersistent;
 
-template <typename T, bool = NeedsAdjustAndMark<T>::value>
-class AdjustAndMarkTrait;
+template <typename T, bool = NeedsAdjustPointer<T>::value>
+class AdjustPointerTrait;
 
 template <typename T>
-class AdjustAndMarkTrait<T, false> {
-  STATIC_ONLY(AdjustAndMarkTrait);
+class AdjustPointerTrait<T, false> {
+  STATIC_ONLY(AdjustPointerTrait);
 
  public:
   static TraceDescriptor GetTraceDescriptor(void* self) {
@@ -69,8 +69,8 @@ class AdjustAndMarkTrait<T, false> {
 };
 
 template <typename T>
-class AdjustAndMarkTrait<T, true> {
-  STATIC_ONLY(AdjustAndMarkTrait);
+class AdjustPointerTrait<T, true> {
+  STATIC_ONLY(AdjustPointerTrait);
 
  public:
   static TraceDescriptor GetTraceDescriptor(const T* self) {
@@ -190,16 +190,16 @@ class TraceTrait {
 
  public:
   static TraceDescriptor GetTraceDescriptor(void* self) {
-    return AdjustAndMarkTrait<T>::GetTraceDescriptor(static_cast<T*>(self));
+    return AdjustPointerTrait<T>::GetTraceDescriptor(static_cast<T*>(self));
   }
 
   static TraceWrapperDescriptor GetTraceWrapperDescriptor(void* self) {
-    return AdjustAndMarkTrait<T>::GetTraceWrapperDescriptor(
+    return AdjustPointerTrait<T>::GetTraceWrapperDescriptor(
         static_cast<T*>(self));
   }
 
   static HeapObjectHeader* GetHeapObjectHeader(void* self) {
-    return AdjustAndMarkTrait<T>::GetHeapObjectHeader(static_cast<T*>(self));
+    return AdjustPointerTrait<T>::GetHeapObjectHeader(static_cast<T*>(self));
   }
 
   static void Trace(Visitor*, void* self);
@@ -223,7 +223,6 @@ void TraceTrait<T>::TraceWrappers(ScriptWrappableVisitor* visitor, void* self) {
   visitor->DispatchTraceWrappers(static_cast<T*>(self));
 }
 
-
 template <typename T, typename Traits>
 struct TraceTrait<HeapVectorBacking<T, Traits>> {
   STATIC_ONLY(TraceTrait);