Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / wtf / DefaultAllocator.h

diff --git a/src/third_party/WebKit/Source/wtf/DefaultAllocator.h b/src/third_party/WebKit/Source/wtf/DefaultAllocator.h
index 004587d..67071e0 100644 (file)
--- a/src/third_party/WebKit/Source/wtf/DefaultAllocator.h
+++ b/src/third_party/WebKit/Source/wtf/DefaultAllocator.h
@@ -107,10 +107,21 @@ public:
     }
 
     template<typename T, typename Traits>
-    static void mark(...)
+    static void trace(...)
     {
         ASSERT_NOT_REACHED();
     }
+
+    template<typename T>
+    struct OtherType {
+        typedef T* Type;
+    };
+
+    template<typename T>
+    static T& getOther(T* other)
+    {
+        return *other;
+    }
 };
 
 // The Windows compiler seems to be very eager to instantiate things it won't