Move some more ENTER_V8 invocations. The biggest one is to move the

one in v8::V8::Initialize to after the early bailout.
Review URL: http://codereview.chromium.org/60083

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1673 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 35d6c8fb
...@@ -1455,11 +1455,14 @@ Local<v8::Object> Value::ToObject() const { ...@@ -1455,11 +1455,14 @@ Local<v8::Object> Value::ToObject() const {
Local<Boolean> Value::ToBoolean() const { Local<Boolean> Value::ToBoolean() const {
if (IsDeadCheck("v8::Value::ToBoolean()")) return Local<Boolean>(); if (IsDeadCheck("v8::Value::ToBoolean()")) return Local<Boolean>();
LOG_API("ToBoolean"); LOG_API("ToBoolean");
ENTER_V8;
i::Handle<i::Object> obj = Utils::OpenHandle(this); i::Handle<i::Object> obj = Utils::OpenHandle(this);
i::Handle<i::Object> val = if (obj->IsBoolean()) {
obj->IsBoolean() ? obj : i::Execution::ToBoolean(obj); return Local<Boolean>(ToApi<Boolean>(obj));
return Local<Boolean>(ToApi<Boolean>(val)); } else {
ENTER_V8;
i::Handle<i::Object> val = i::Execution::ToBoolean(obj);
return Local<Boolean>(ToApi<Boolean>(val));
}
} }
...@@ -1580,11 +1583,14 @@ v8::Date* v8::Date::Cast(v8::Value* that) { ...@@ -1580,11 +1583,14 @@ v8::Date* v8::Date::Cast(v8::Value* that) {
bool Value::BooleanValue() const { bool Value::BooleanValue() const {
if (IsDeadCheck("v8::Value::BooleanValue()")) return false; if (IsDeadCheck("v8::Value::BooleanValue()")) return false;
LOG_API("BooleanValue"); LOG_API("BooleanValue");
ENTER_V8;
i::Handle<i::Object> obj = Utils::OpenHandle(this); i::Handle<i::Object> obj = Utils::OpenHandle(this);
i::Handle<i::Object> value = if (obj->IsBoolean()) {
obj->IsBoolean() ? obj : i::Execution::ToBoolean(obj); return obj->IsTrue();
return value->IsTrue(); } else {
ENTER_V8;
i::Handle<i::Object> value = i::Execution::ToBoolean(obj);
return value->IsTrue();
}
} }
...@@ -2347,8 +2353,8 @@ void v8::Object::SetInternalField(int index, v8::Handle<Value> value) { ...@@ -2347,8 +2353,8 @@ void v8::Object::SetInternalField(int index, v8::Handle<Value> value) {
// --- E n v i r o n m e n t --- // --- E n v i r o n m e n t ---
bool v8::V8::Initialize() { bool v8::V8::Initialize() {
ENTER_V8;
if (i::V8::HasBeenSetup()) return true; if (i::V8::HasBeenSetup()) return true;
ENTER_V8;
HandleScope scope; HandleScope scope;
if (i::Snapshot::Initialize()) { if (i::Snapshot::Initialize()) {
return true; return true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment