Commit ae287f04 authored by dcarney@chromium.org's avatar dcarney@chromium.org

build fix for 14530

TBR=svenpanne@chromium.org
BUG=
TEST=

Review URL: https://codereview.chromium.org/14881002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14532 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 2e856d2c
...@@ -36,7 +36,7 @@ using namespace v8; ...@@ -36,7 +36,7 @@ using namespace v8;
TEST(StrictUndeclaredGlobalVariable) { TEST(StrictUndeclaredGlobalVariable) {
HandleScope scope(Isolate::GetCurrent()); HandleScope scope(Isolate::GetCurrent());
v8::Local<v8::String> var_name = v8_str("x"); v8::Local<v8::String> var_name = v8_str("x");
LocalContext context; v8::LocalContext context;
v8::TryCatch try_catch; v8::TryCatch try_catch;
v8::Local<v8::Script> script = v8_compile("\"use strict\"; x = 42;"); v8::Local<v8::Script> script = v8_compile("\"use strict\"; x = 42;");
v8::Handle<v8::Object> proto = v8::Object::New(); v8::Handle<v8::Object> proto = v8::Object::New();
......
...@@ -57,7 +57,7 @@ class HarmonyIsolate { ...@@ -57,7 +57,7 @@ class HarmonyIsolate {
TEST(PerIsolateState) { TEST(PerIsolateState) {
HarmonyIsolate isolate; HarmonyIsolate isolate;
HandleScope scope(isolate.GetIsolate()); HandleScope scope(isolate.GetIsolate());
LocalContext context1; v8::LocalContext context1;
CompileRun( CompileRun(
"var count = 0;" "var count = 0;"
"var calls = 0;" "var calls = 0;"
...@@ -70,20 +70,20 @@ TEST(PerIsolateState) { ...@@ -70,20 +70,20 @@ TEST(PerIsolateState) {
"(function() { obj.foo = 'bar'; })"); "(function() { obj.foo = 'bar'; })");
Handle<Value> notify_fun2; Handle<Value> notify_fun2;
{ {
LocalContext context2; v8::LocalContext context2;
context2->Global()->Set(String::New("obj"), obj); context2->Global()->Set(String::New("obj"), obj);
notify_fun2 = CompileRun( notify_fun2 = CompileRun(
"(function() { obj.foo = 'baz'; })"); "(function() { obj.foo = 'baz'; })");
} }
Handle<Value> notify_fun3; Handle<Value> notify_fun3;
{ {
LocalContext context3; v8::LocalContext context3;
context3->Global()->Set(String::New("obj"), obj); context3->Global()->Set(String::New("obj"), obj);
notify_fun3 = CompileRun( notify_fun3 = CompileRun(
"(function() { obj.foo = 'bat'; })"); "(function() { obj.foo = 'bat'; })");
} }
{ {
LocalContext context4; v8::LocalContext context4;
context4->Global()->Set(String::New("observer"), observer); context4->Global()->Set(String::New("observer"), observer);
context4->Global()->Set(String::New("fun1"), notify_fun1); context4->Global()->Set(String::New("fun1"), notify_fun1);
context4->Global()->Set(String::New("fun2"), notify_fun2); context4->Global()->Set(String::New("fun2"), notify_fun2);
...@@ -97,7 +97,7 @@ TEST(PerIsolateState) { ...@@ -97,7 +97,7 @@ TEST(PerIsolateState) {
TEST(EndOfMicrotaskDelivery) { TEST(EndOfMicrotaskDelivery) {
HarmonyIsolate isolate; HarmonyIsolate isolate;
HandleScope scope(isolate.GetIsolate()); HandleScope scope(isolate.GetIsolate());
LocalContext context; v8::LocalContext context;
CompileRun( CompileRun(
"var obj = {};" "var obj = {};"
"var count = 0;" "var count = 0;"
...@@ -110,7 +110,7 @@ TEST(EndOfMicrotaskDelivery) { ...@@ -110,7 +110,7 @@ TEST(EndOfMicrotaskDelivery) {
TEST(DeliveryOrdering) { TEST(DeliveryOrdering) {
HarmonyIsolate isolate; HarmonyIsolate isolate;
HandleScope scope(isolate.GetIsolate()); HandleScope scope(isolate.GetIsolate());
LocalContext context; v8::LocalContext context;
CompileRun( CompileRun(
"var obj1 = {};" "var obj1 = {};"
"var obj2 = {};" "var obj2 = {};"
...@@ -141,7 +141,7 @@ TEST(DeliveryOrdering) { ...@@ -141,7 +141,7 @@ TEST(DeliveryOrdering) {
TEST(DeliveryOrderingReentrant) { TEST(DeliveryOrderingReentrant) {
HarmonyIsolate isolate; HarmonyIsolate isolate;
HandleScope scope(isolate.GetIsolate()); HandleScope scope(isolate.GetIsolate());
LocalContext context; v8::LocalContext context;
CompileRun( CompileRun(
"var obj = {};" "var obj = {};"
"var reentered = false;" "var reentered = false;"
...@@ -172,7 +172,7 @@ TEST(DeliveryOrderingReentrant) { ...@@ -172,7 +172,7 @@ TEST(DeliveryOrderingReentrant) {
TEST(DeliveryOrderingDeliverChangeRecords) { TEST(DeliveryOrderingDeliverChangeRecords) {
HarmonyIsolate isolate; HarmonyIsolate isolate;
HandleScope scope(isolate.GetIsolate()); HandleScope scope(isolate.GetIsolate());
LocalContext context; v8::LocalContext context;
CompileRun( CompileRun(
"var obj = {};" "var obj = {};"
"var ordering = [];" "var ordering = [];"
...@@ -197,14 +197,14 @@ TEST(ObjectHashTableGrowth) { ...@@ -197,14 +197,14 @@ TEST(ObjectHashTableGrowth) {
HarmonyIsolate isolate; HarmonyIsolate isolate;
HandleScope scope(isolate.GetIsolate()); HandleScope scope(isolate.GetIsolate());
// Initializing this context sets up initial hash tables. // Initializing this context sets up initial hash tables.
LocalContext context; v8::LocalContext context;
Handle<Value> obj = CompileRun("obj = {};"); Handle<Value> obj = CompileRun("obj = {};");
Handle<Value> observer = CompileRun( Handle<Value> observer = CompileRun(
"var ran = false;" "var ran = false;"
"(function() { ran = true })"); "(function() { ran = true })");
{ {
// As does initializing this context. // As does initializing this context.
LocalContext context2; v8::LocalContext context2;
context2->Global()->Set(String::New("obj"), obj); context2->Global()->Set(String::New("obj"), obj);
context2->Global()->Set(String::New("observer"), observer); context2->Global()->Set(String::New("observer"), observer);
CompileRun( CompileRun(
...@@ -224,7 +224,7 @@ TEST(ObjectHashTableGrowth) { ...@@ -224,7 +224,7 @@ TEST(ObjectHashTableGrowth) {
TEST(GlobalObjectObservation) { TEST(GlobalObjectObservation) {
HarmonyIsolate isolate; HarmonyIsolate isolate;
LocalContext context; v8::LocalContext context;
HandleScope scope(isolate.GetIsolate()); HandleScope scope(isolate.GetIsolate());
Handle<Object> global_proxy = context->Global(); Handle<Object> global_proxy = context->Global();
Handle<Object> inner_global = global_proxy->GetPrototype().As<Object>(); Handle<Object> inner_global = global_proxy->GetPrototype().As<Object>();
...@@ -256,7 +256,7 @@ TEST(GlobalObjectObservation) { ...@@ -256,7 +256,7 @@ TEST(GlobalObjectObservation) {
// to the old context. // to the old context.
context->DetachGlobal(); context->DetachGlobal();
{ {
LocalContext context2; v8::LocalContext context2;
context2->DetachGlobal(); context2->DetachGlobal();
context2->ReattachGlobal(global_proxy); context2->ReattachGlobal(global_proxy);
CompileRun( CompileRun(
...@@ -271,7 +271,7 @@ TEST(GlobalObjectObservation) { ...@@ -271,7 +271,7 @@ TEST(GlobalObjectObservation) {
// Attaching by passing to Context::New // Attaching by passing to Context::New
{ {
// Delegates to Context::New // Delegates to Context::New
LocalContext context3(NULL, Handle<ObjectTemplate>(), global_proxy); v8::LocalContext context3(NULL, Handle<ObjectTemplate>(), global_proxy);
CompileRun( CompileRun(
"var records3 = [];" "var records3 = [];"
"Object.observe(this, function(r) { [].push.apply(records3, r) });" "Object.observe(this, function(r) { [].push.apply(records3, r) });"
...@@ -320,7 +320,7 @@ static void ExpectRecords(Handle<Value> records, ...@@ -320,7 +320,7 @@ static void ExpectRecords(Handle<Value> records,
TEST(APITestBasicMutation) { TEST(APITestBasicMutation) {
HarmonyIsolate isolate; HarmonyIsolate isolate;
HandleScope scope(isolate.GetIsolate()); HandleScope scope(isolate.GetIsolate());
LocalContext context; v8::LocalContext context;
Handle<Object> obj = Handle<Object>::Cast(CompileRun( Handle<Object> obj = Handle<Object>::Cast(CompileRun(
"var records = [];" "var records = [];"
"var obj = {};" "var obj = {};"
...@@ -363,7 +363,7 @@ TEST(APITestBasicMutation) { ...@@ -363,7 +363,7 @@ TEST(APITestBasicMutation) {
TEST(HiddenPrototypeObservation) { TEST(HiddenPrototypeObservation) {
HarmonyIsolate isolate; HarmonyIsolate isolate;
HandleScope scope(isolate.GetIsolate()); HandleScope scope(isolate.GetIsolate());
LocalContext context; v8::LocalContext context;
Handle<FunctionTemplate> tmpl = FunctionTemplate::New(); Handle<FunctionTemplate> tmpl = FunctionTemplate::New();
tmpl->SetHiddenPrototype(true); tmpl->SetHiddenPrototype(true);
tmpl->InstanceTemplate()->Set(String::New("foo"), Number::New(75)); tmpl->InstanceTemplate()->Set(String::New("foo"), Number::New(75));
...@@ -412,7 +412,7 @@ static int NumberOfElements(i::Handle<i::JSWeakMap> map) { ...@@ -412,7 +412,7 @@ static int NumberOfElements(i::Handle<i::JSWeakMap> map) {
TEST(ObservationWeakMap) { TEST(ObservationWeakMap) {
HarmonyIsolate isolate; HarmonyIsolate isolate;
HandleScope scope(isolate.GetIsolate()); HandleScope scope(isolate.GetIsolate());
LocalContext context; v8::LocalContext context;
CompileRun( CompileRun(
"var obj = {};" "var obj = {};"
"Object.observe(obj, function(){});" "Object.observe(obj, function(){});"
......
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