Upstream version 9.38.198.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 9be80e3..4e6dc75 100644 (file)
--- a/src/third_party/WebKit/Source/wtf/DefaultAllocator.h
+++ b/src/third_party/WebKit/Source/wtf/DefaultAllocator.h
@@ -103,6 +103,8 @@ public:
         free(ptr); // Not the system free, the one from this class.
     }
 
+    static bool isAllocationAllowed() { return true; }
+
     static void markNoTracing(...)
     {
         ASSERT_NOT_REACHED();
@@ -113,6 +115,19 @@ public:
         ASSERT_NOT_REACHED();
     }
 
+    static void registerWeakTable(...)
+    {
+        ASSERT_NOT_REACHED();
+    }
+
+#if ENABLE(ASSERT)
+    static bool weakTableRegistered(...)
+    {
+        ASSERT_NOT_REACHED();
+        return false;
+    }
+#endif
+
     template<typename T, typename Traits>
     static void trace(...)
     {