1 files changed, 3 insertions, 21 deletions
diff --git a/WebCore/bindings/v8/V8Utilities.h b/WebCore/bindings/v8/V8Utilities.h
index fdabc7a..781d2bb 100644
--- a/WebCore/bindings/v8/V8Utilities.h
+++ b/WebCore/bindings/v8/V8Utilities.h
@@ -31,6 +31,7 @@
 #ifndef V8Utilities_h
 #define V8Utilities_h
 
+#ifdef MANUAL_MERGE_REQUIRED
 // FIXME: Remove once chromium dependencies on v8_utility.h are removed.
 #define V8UTILITIES_DEFINED 1
 #if ENABLE(V8_LOCKERS)
@@ -39,6 +40,8 @@
 #define LOCK_V8 ((void) 0)
 #endif
 
+#else // MANUAL_MERGE_REQUIRED
+#endif // MANUAL_MERGE_REQUIRED
 #include <v8.h>
 
 namespace WebCore {
@@ -80,11 +83,6 @@ namespace WebCore {
       static inline v8::Local<v8::Object> newInstance(v8::Handle<v8::Function>);
       static inline v8::Local<v8::Object> newInstance(v8::Handle<v8::ObjectTemplate>);
       static inline v8::Local<v8::Object> newInstance(v8::Handle<v8::Function>, int argc, v8::Handle<v8::Value> argv[]);
-
-      // FIXME: These NewInstance functions are here to ease upstreaming. Remove along with V8UTILITIES_DEFINED once chromium dependencies on v8_utility.h are removed.
-      static inline v8::Local<v8::Object> NewInstance(v8::Handle<v8::Function>);
-      static inline v8::Local<v8::Object> NewInstance(v8::Handle<v8::ObjectTemplate>);
-      static inline v8::Local<v8::Object> NewInstance(v8::Handle<v8::Function>, int argc, v8::Handle<v8::Value> argv[]);
     };
 
     v8::Local<v8::Object> SafeAllocation::newInstance(v8::Handle<v8::Function> function)
@@ -111,22 +109,6 @@ namespace WebCore {
         return function->NewInstance(argc, argv);
     }
 
-    // FIXME: These NewInstance functions are here to ease upstreaming. Remove along with V8UTILITIES_DEFINED once chromium dependencies on v8_utility.h are removed.
-    v8::Local<v8::Object> SafeAllocation::NewInstance(v8::Handle<v8::Function> function)
-    {
-        return newInstance(function);
-    }
-
-    v8::Local<v8::Object> SafeAllocation::NewInstance(v8::Handle<v8::ObjectTemplate> objectTemplate)
-    {
-        return newInstance(objectTemplate);
-    }
-
-    v8::Local<v8::Object> SafeAllocation::NewInstance(v8::Handle<v8::Function> function, int argc, v8::Handle<v8::Value> argv[])
-    {
-        return newInstance(function, argc, argv);
-    }
-
 } // namespace WebCore
 
 #endif // V8Utilities_h