Revert r18449 "Reland r18383: More API cleanup." and r18450 "Unbreak build."

include/v8.h

Index: include/v8.h
diff --git a/include/v8.h b/include/v8.h
index c073fb30a53c88aaff85e61aed6848adb69cc27d..2c8245185383d5a52a4ed20e9b8df4bfc8438b3e 100644
--- a/include/v8.h
+++ b/include/v8.h
@@ -1668,6 +1668,7 @@ class V8_EXPORT String : public Primitive {
   /**
    * A zero length string.
    */
+  static v8::Local<v8::String> Empty();
   V8_INLINE static v8::Local<v8::String> Empty(Isolate* isolate);
 
   /**
@@ -1962,6 +1963,8 @@ class V8_EXPORT Number : public Primitive {
  public:
   double Value() const;
   static Local<Number> New(Isolate* isolate, double value);
+  // Will be deprecated soon.
+  static Local<Number> New(double value);
   V8_INLINE static Number* Cast(v8::Value* obj);
  private:
   Number();
@@ -1976,6 +1979,11 @@ class V8_EXPORT Integer : public Number {
  public:
   static Local<Integer> New(Isolate* isolate, int32_t value);
   static Local<Integer> NewFromUnsigned(Isolate* isolate, uint32_t value);
+  // Will be deprecated soon.
+  static Local<Integer> New(int32_t value, Isolate*);
+  static Local<Integer> NewFromUnsigned(uint32_t value, Isolate*);
+  static Local<Integer> New(int32_t value);
+  static Local<Integer> NewFromUnsigned(uint32_t value);
   int64_t Value() const;
   V8_INLINE static Integer* Cast(v8::Value* obj);
  private:
@@ -2329,7 +2337,8 @@ class V8_EXPORT Object : public Value {
   Local<Value> CallAsConstructor(int argc, Handle<Value> argv[]);
 
   static Local<Object> New(Isolate* isolate);
-
+  // Will be deprecated soon.
+  static Local<Object> New();
   V8_INLINE static Object* Cast(Value* obj);
 
  private:
@@ -3344,6 +3353,12 @@ class V8_EXPORT FunctionTemplate : public Template {
       Handle<Value> data = Handle<Value>(),
       Handle<Signature> signature = Handle<Signature>(),
       int length = 0);
+  // Will be deprecated soon.
+  static Local<FunctionTemplate> New(
+      FunctionCallback callback = 0,
+      Handle<Value> data = Handle<Value>(),
+      Handle<Signature> signature = Handle<Signature>(),
+      int length = 0);
 
   /** Returns the unique function instance in the current execution context.*/
   Local<Function> GetFunction();
@@ -5783,7 +5798,7 @@ void ReturnValue<T>::Set(int32_t i) {
     *value_ = I::IntToSmi(i);
     return;
   }
-  Set(Integer::New(GetIsolate(), i));
+  Set(Integer::New(i, GetIsolate()));
 }
 
 template<typename T>
@@ -5795,7 +5810,7 @@ void ReturnValue<T>::Set(uint32_t i) {
     Set(static_cast<int32_t>(i));
     return;
   }
-  Set(Integer::NewFromUnsigned(GetIsolate(), i));
+  Set(Integer::NewFromUnsigned(i, GetIsolate()));
 }
 
 template<typename T>