OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/renderer/module_system.h" | 5 #include "chrome/renderer/module_system.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScopedMicrotaskSup
pression.h" | 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScopedMicrotaskSup
pression.h" |
9 | 9 |
10 namespace { | 10 namespace { |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 // static | 62 // static |
63 void ModuleSystem::DumpException(const v8::TryCatch& try_catch) { | 63 void ModuleSystem::DumpException(const v8::TryCatch& try_catch) { |
64 v8::Handle<v8::Message> message(try_catch.Message()); | 64 v8::Handle<v8::Message> message(try_catch.Message()); |
65 if (message.IsEmpty()) { | 65 if (message.IsEmpty()) { |
66 LOG(ERROR) << "try_catch has no message"; | 66 LOG(ERROR) << "try_catch has no message"; |
67 return; | 67 return; |
68 } | 68 } |
69 | 69 |
70 std::string resource_name = "<unknown resource>"; | 70 std::string resource_name = "<unknown resource>"; |
71 if (!message->GetScriptResourceName().IsEmpty()) { | 71 if (!message->GetScriptResourceName().IsEmpty()) { |
72 resource_name = *v8::String::Utf8Value( | 72 resource_name = |
73 message->GetScriptResourceName()->ToString()); | 73 *v8::String::Utf8Value(message->GetScriptResourceName()->ToString()); |
74 } | 74 } |
75 | 75 |
76 std::string error_message = "<no error message>"; | 76 std::string error_message = "<no error message>"; |
77 if (!message->Get().IsEmpty()) | 77 if (!message->Get().IsEmpty()) |
78 error_message = *v8::String::Utf8Value(message->Get()); | 78 error_message = *v8::String::Utf8Value(message->Get()); |
79 | 79 |
80 std::string stack_trace = "<stack trace unavailable>"; | 80 std::string stack_trace = "<stack trace unavailable>"; |
81 if (!try_catch.StackTrace().IsEmpty()) | 81 if (!try_catch.StackTrace().IsEmpty()) |
82 stack_trace = *v8::String::Utf8Value(try_catch.StackTrace()); | 82 stack_trace = *v8::String::Utf8Value(try_catch.StackTrace()); |
83 | 83 |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
251 v8::Handle<v8::String> left = | 251 v8::Handle<v8::String> left = |
252 v8::String::New("(function(require, requireNative, exports) {"); | 252 v8::String::New("(function(require, requireNative, exports) {"); |
253 v8::Handle<v8::String> right = v8::String::New("\n})"); | 253 v8::Handle<v8::String> right = v8::String::New("\n})"); |
254 return handle_scope.Close( | 254 return handle_scope.Close( |
255 v8::String::Concat(left, v8::String::Concat(source, right))); | 255 v8::String::Concat(left, v8::String::Concat(source, right))); |
256 } | 256 } |
257 | 257 |
258 v8::Handle<v8::Value> ModuleSystem::ThrowException(const std::string& message) { | 258 v8::Handle<v8::Value> ModuleSystem::ThrowException(const std::string& message) { |
259 return v8::ThrowException(v8::String::New(message.c_str())); | 259 return v8::ThrowException(v8::String::New(message.c_str())); |
260 } | 260 } |
OLD | NEW |