| Index: test/cctest/test-api.cc
|
| diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
|
| index 9e9e03a937910963966f923e4bad19aa7d30c2ce..a97cd1ffa1d5c9a1f29c3e4780df057b62bb3aeb 100644
|
| --- a/test/cctest/test-api.cc
|
| +++ b/test/cctest/test-api.cc
|
| @@ -4039,8 +4039,9 @@ TEST(MessageHandler2) {
|
| static void check_message_3(v8::Handle<v8::Message> message,
|
| v8::Handle<Value> data) {
|
| CHECK(message->IsSharedCrossOrigin());
|
| - CHECK(message->GetScriptOrigin().ResourceIsSharedCrossOrigin()->Value());
|
| - CHECK(message->GetScriptOrigin().ResourceIsEmbedderDebugScript()->Value());
|
| + CHECK(message->GetScriptOrigin().Options().IsSharedCrossOrigin());
|
| + CHECK(message->GetScriptOrigin().Options().IsEmbedderDebugScript());
|
| + CHECK(message->GetScriptOrigin().Options().IsOpaque());
|
| CHECK_EQ(6.75, message->GetScriptOrigin().ResourceName()->NumberValue());
|
| CHECK_EQ(7.40, message->GetScriptOrigin().SourceMapUrl()->NumberValue());
|
| message_received = true;
|
| @@ -4057,7 +4058,7 @@ TEST(MessageHandler3) {
|
| v8::ScriptOrigin origin = v8::ScriptOrigin(
|
| v8_str("6.75"), v8::Integer::New(isolate, 1),
|
| v8::Integer::New(isolate, 2), v8::True(isolate), Handle<v8::Integer>(),
|
| - v8::True(isolate), v8_str("7.40"));
|
| + v8::True(isolate), v8_str("7.40"), v8::True(isolate));
|
| v8::Handle<v8::Script> script =
|
| Script::Compile(v8_str("throw 'error'"), &origin);
|
| script->Run();
|
| @@ -4117,11 +4118,11 @@ TEST(MessageHandler5) {
|
| CHECK(!message_received);
|
| v8::V8::AddMessageListener(check_message_5a);
|
| LocalContext context;
|
| - v8::ScriptOrigin origin =
|
| + v8::ScriptOrigin origin1 =
|
| v8::ScriptOrigin(v8_str("6.75"), v8::Integer::New(isolate, 1),
|
| v8::Integer::New(isolate, 2), v8::True(isolate));
|
| v8::Handle<v8::Script> script =
|
| - Script::Compile(v8_str("throw 'error'"), &origin);
|
| + Script::Compile(v8_str("throw 'error'"), &origin1);
|
| script->Run();
|
| CHECK(message_received);
|
| // clear out the message listener
|
| @@ -4129,9 +4130,10 @@ TEST(MessageHandler5) {
|
|
|
| message_received = false;
|
| v8::V8::AddMessageListener(check_message_5b);
|
| - origin = v8::ScriptOrigin(v8_str("6.75"), v8::Integer::New(isolate, 1),
|
| - v8::Integer::New(isolate, 2), v8::False(isolate));
|
| - script = Script::Compile(v8_str("throw 'error'"), &origin);
|
| + v8::ScriptOrigin origin2 =
|
| + v8::ScriptOrigin(v8_str("6.75"), v8::Integer::New(isolate, 1),
|
| + v8::Integer::New(isolate, 2), v8::False(isolate));
|
| + script = Script::Compile(v8_str("throw 'error'"), &origin2);
|
| script->Run();
|
| CHECK(message_received);
|
| // clear out the message listener
|
| @@ -15611,7 +15613,8 @@ THREADED_TEST(ScriptOrigin) {
|
| v8::Integer::New(env->GetIsolate(), 1),
|
| v8::Integer::New(env->GetIsolate(), 1), v8::True(env->GetIsolate()),
|
| v8::Handle<v8::Integer>(), v8::True(env->GetIsolate()),
|
| - v8::String::NewFromUtf8(env->GetIsolate(), "http://sourceMapUrl"));
|
| + v8::String::NewFromUtf8(env->GetIsolate(), "http://sourceMapUrl"),
|
| + v8::True(env->GetIsolate()));
|
| v8::Handle<v8::String> script = v8::String::NewFromUtf8(
|
| env->GetIsolate(), "function f() {}\n\nfunction g() {}");
|
| v8::Script::Compile(script, &origin)->Run();
|
| @@ -15624,8 +15627,9 @@ THREADED_TEST(ScriptOrigin) {
|
| CHECK_EQ(0, strcmp("test",
|
| *v8::String::Utf8Value(script_origin_f.ResourceName())));
|
| CHECK_EQ(1, script_origin_f.ResourceLineOffset()->Int32Value());
|
| - CHECK(script_origin_f.ResourceIsSharedCrossOrigin()->Value());
|
| - CHECK(script_origin_f.ResourceIsEmbedderDebugScript()->Value());
|
| + CHECK(script_origin_f.Options().IsSharedCrossOrigin());
|
| + CHECK(script_origin_f.Options().IsEmbedderDebugScript());
|
| + CHECK(script_origin_f.Options().IsOpaque());
|
| printf("is name = %d\n", script_origin_f.SourceMapUrl()->IsUndefined());
|
|
|
| CHECK_EQ(0, strcmp("http://sourceMapUrl",
|
| @@ -15635,8 +15639,9 @@ THREADED_TEST(ScriptOrigin) {
|
| CHECK_EQ(0, strcmp("test",
|
| *v8::String::Utf8Value(script_origin_g.ResourceName())));
|
| CHECK_EQ(1, script_origin_g.ResourceLineOffset()->Int32Value());
|
| - CHECK(script_origin_g.ResourceIsSharedCrossOrigin()->Value());
|
| - CHECK(script_origin_g.ResourceIsEmbedderDebugScript()->Value());
|
| + CHECK(script_origin_g.Options().IsSharedCrossOrigin());
|
| + CHECK(script_origin_g.Options().IsEmbedderDebugScript());
|
| + CHECK(script_origin_g.Options().IsOpaque());
|
| CHECK_EQ(0, strcmp("http://sourceMapUrl",
|
| *v8::String::Utf8Value(script_origin_g.SourceMapUrl())));
|
| }
|
|
|