v8.h | v8.h | |||
---|---|---|---|---|
skipping to change at line 1642 | skipping to change at line 1642 | |||
int options = NO_OPTIONS) const; | int options = NO_OPTIONS) const; | |||
// UTF-8 encoded characters. | // UTF-8 encoded characters. | |||
int WriteUtf8(char* buffer, | int WriteUtf8(char* buffer, | |||
int length = -1, | int length = -1, | |||
int* nchars_ref = NULL, | int* nchars_ref = NULL, | |||
int options = NO_OPTIONS) const; | int options = NO_OPTIONS) const; | |||
/** | /** | |||
* A zero length string. | * A zero length string. | |||
*/ | */ | |||
static v8::Local<v8::String> Empty(); | ||||
V8_INLINE static v8::Local<v8::String> Empty(Isolate* isolate); | V8_INLINE static v8::Local<v8::String> Empty(Isolate* isolate); | |||
/** | /** | |||
* Returns true if the string is external | * Returns true if the string is external | |||
*/ | */ | |||
bool IsExternal() const; | bool IsExternal() const; | |||
/** | /** | |||
* Returns true if the string is both external and ASCII | * Returns true if the string is both external and ASCII | |||
*/ | */ | |||
skipping to change at line 1934 | skipping to change at line 1933 | |||
Private(); | Private(); | |||
}; | }; | |||
/** | /** | |||
* A JavaScript number value (ECMA-262, 4.3.20) | * A JavaScript number value (ECMA-262, 4.3.20) | |||
*/ | */ | |||
class V8_EXPORT Number : public Primitive { | class V8_EXPORT Number : public Primitive { | |||
public: | public: | |||
double Value() const; | double Value() const; | |||
static Local<Number> New(Isolate* isolate, double value); | 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); | V8_INLINE static Number* Cast(v8::Value* obj); | |||
private: | private: | |||
Number(); | Number(); | |||
static void CheckCast(v8::Value* obj); | static void CheckCast(v8::Value* obj); | |||
}; | }; | |||
/** | /** | |||
* A JavaScript value representing a signed integer. | * A JavaScript value representing a signed integer. | |||
*/ | */ | |||
class V8_EXPORT Integer : public Number { | class V8_EXPORT Integer : public Number { | |||
public: | public: | |||
static Local<Integer> New(Isolate* isolate, int32_t value); | static Local<Integer> New(Isolate* isolate, int32_t value); | |||
static Local<Integer> NewFromUnsigned(Isolate* isolate, uint32_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; | int64_t Value() const; | |||
V8_INLINE static Integer* Cast(v8::Value* obj); | V8_INLINE static Integer* Cast(v8::Value* obj); | |||
private: | private: | |||
Integer(); | Integer(); | |||
static void CheckCast(v8::Value* obj); | static void CheckCast(v8::Value* obj); | |||
}; | }; | |||
/** | /** | |||
* A JavaScript value representing a 32-bit signed integer. | * A JavaScript value representing a 32-bit signed integer. | |||
*/ | */ | |||
skipping to change at line 2301 | skipping to change at line 2293 | |||
Handle<Value> argv[]); | Handle<Value> argv[]); | |||
/** | /** | |||
* Call an Object as a constructor if a callback is set by the | * Call an Object as a constructor if a callback is set by the | |||
* ObjectTemplate::SetCallAsFunctionHandler method. | * ObjectTemplate::SetCallAsFunctionHandler method. | |||
* Note: This method behaves like the Function::NewInstance method. | * Note: This method behaves like the Function::NewInstance method. | |||
*/ | */ | |||
Local<Value> CallAsConstructor(int argc, Handle<Value> argv[]); | Local<Value> CallAsConstructor(int argc, Handle<Value> argv[]); | |||
static Local<Object> New(Isolate* isolate); | static Local<Object> New(Isolate* isolate); | |||
// Will be deprecated soon. | ||||
static Local<Object> New(); | ||||
V8_INLINE static Object* Cast(Value* obj); | V8_INLINE static Object* Cast(Value* obj); | |||
private: | private: | |||
Object(); | Object(); | |||
static void CheckCast(Value* obj); | static void CheckCast(Value* obj); | |||
Local<Value> SlowGetInternalField(int index); | Local<Value> SlowGetInternalField(int index); | |||
void* SlowGetAlignedPointerFromInternalField(int index); | void* SlowGetAlignedPointerFromInternalField(int index); | |||
}; | }; | |||
/** | /** | |||
skipping to change at line 3275 | skipping to change at line 3266 | |||
*/ | */ | |||
class V8_EXPORT FunctionTemplate : public Template { | class V8_EXPORT FunctionTemplate : public Template { | |||
public: | public: | |||
/** Creates a function template.*/ | /** Creates a function template.*/ | |||
static Local<FunctionTemplate> New( | static Local<FunctionTemplate> New( | |||
Isolate* isolate, | Isolate* isolate, | |||
FunctionCallback callback = 0, | FunctionCallback callback = 0, | |||
Handle<Value> data = Handle<Value>(), | Handle<Value> data = Handle<Value>(), | |||
Handle<Signature> signature = Handle<Signature>(), | Handle<Signature> signature = Handle<Signature>(), | |||
int length = 0); | 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 .*/ | /** Returns the unique function instance in the current execution context .*/ | |||
Local<Function> GetFunction(); | Local<Function> GetFunction(); | |||
/** | /** | |||
* Set the call-handler callback for a FunctionTemplate. This | * Set the call-handler callback for a FunctionTemplate. This | |||
* callback is called whenever the function created from this | * callback is called whenever the function created from this | |||
* FunctionTemplate is called. | * FunctionTemplate is called. | |||
*/ | */ | |||
void SetCallHandler(FunctionCallback callback, | void SetCallHandler(FunctionCallback callback, | |||
skipping to change at line 5656 | skipping to change at line 5641 | |||
} | } | |||
template<typename T> | template<typename T> | |||
void ReturnValue<T>::Set(int32_t i) { | void ReturnValue<T>::Set(int32_t i) { | |||
TYPE_CHECK(T, Integer); | TYPE_CHECK(T, Integer); | |||
typedef internal::Internals I; | typedef internal::Internals I; | |||
if (V8_LIKELY(I::IsValidSmi(i))) { | if (V8_LIKELY(I::IsValidSmi(i))) { | |||
*value_ = I::IntToSmi(i); | *value_ = I::IntToSmi(i); | |||
return; | return; | |||
} | } | |||
Set(Integer::New(i, GetIsolate())); | Set(Integer::New(GetIsolate(), i)); | |||
} | } | |||
template<typename T> | template<typename T> | |||
void ReturnValue<T>::Set(uint32_t i) { | void ReturnValue<T>::Set(uint32_t i) { | |||
TYPE_CHECK(T, Integer); | TYPE_CHECK(T, Integer); | |||
// Can't simply use INT32_MAX here for whatever reason. | // Can't simply use INT32_MAX here for whatever reason. | |||
bool fits_into_int32_t = (i & (1U << 31)) == 0; | bool fits_into_int32_t = (i & (1U << 31)) == 0; | |||
if (V8_LIKELY(fits_into_int32_t)) { | if (V8_LIKELY(fits_into_int32_t)) { | |||
Set(static_cast<int32_t>(i)); | Set(static_cast<int32_t>(i)); | |||
return; | return; | |||
} | } | |||
Set(Integer::NewFromUnsigned(i, GetIsolate())); | Set(Integer::NewFromUnsigned(GetIsolate(), i)); | |||
} | } | |||
template<typename T> | template<typename T> | |||
void ReturnValue<T>::Set(bool value) { | void ReturnValue<T>::Set(bool value) { | |||
TYPE_CHECK(T, Boolean); | TYPE_CHECK(T, Boolean); | |||
typedef internal::Internals I; | typedef internal::Internals I; | |||
int root_index; | int root_index; | |||
if (value) { | if (value) { | |||
root_index = I::kTrueValueRootIndex; | root_index = I::kTrueValueRootIndex; | |||
} else { | } else { | |||
End of changes. 7 change blocks. | ||||
18 lines changed or deleted | 3 lines changed or added | |||