Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "config.h" | 5 #include "config.h" |
| 6 #include "bindings/core/v8/PrivateScriptRunner.h" | 6 #include "bindings/core/v8/PrivateScriptRunner.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/DOMWrapperWorld.h" | 8 #include "bindings/core/v8/DOMWrapperWorld.h" |
| 9 #include "bindings/core/v8/ExceptionState.h" | 9 #include "bindings/core/v8/ExceptionState.h" |
| 10 #include "bindings/core/v8/V8Binding.h" | 10 #include "bindings/core/v8/V8Binding.h" |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 198 v8::Handle<v8::Object> classObject = classObjectOfPrivateScript(scriptState, className); | 198 v8::Handle<v8::Object> classObject = classObjectOfPrivateScript(scriptState, className); |
| 199 v8::Handle<v8::Value> method = classObject->Get(v8String(scriptState->isolat e(), methodName)); | 199 v8::Handle<v8::Value> method = classObject->Get(v8String(scriptState->isolat e(), methodName)); |
| 200 if (method.IsEmpty() || !method->IsFunction()) { | 200 if (method.IsEmpty() || !method->IsFunction()) { |
| 201 LOG_ERROR_ALWAYS("Private script error: Target DOM method was not found. (Class name = %s, Method name = %s)\n", className.utf8().data(), methodName.utf 8().data()); | 201 LOG_ERROR_ALWAYS("Private script error: Target DOM method was not found. (Class name = %s, Method name = %s)\n", className.utf8().data(), methodName.utf 8().data()); |
| 202 RELEASE_ASSERT_NOT_REACHED(); | 202 RELEASE_ASSERT_NOT_REACHED(); |
| 203 } | 203 } |
| 204 initializeHolderIfNeeded(scriptState, classObject, holder); | 204 initializeHolderIfNeeded(scriptState, classObject, holder); |
| 205 return V8ScriptRunner::callFunction(v8::Handle<v8::Function>::Cast(method), scriptState->executionContext(), holder, argc, argv, scriptState->isolate()); | 205 return V8ScriptRunner::callFunction(v8::Handle<v8::Function>::Cast(method), scriptState->executionContext(), holder, argc, argv, scriptState->isolate()); |
| 206 } | 206 } |
| 207 | 207 |
| 208 bool PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(v8::Isolate* isolate, ExceptionState& exceptionState, v8::Handle<v8::Value> exception) | 208 static void dumpJSError(String exceptionName, String message) |
| 209 { | 209 { |
| 210 // FIXME: Set a ScriptOrigin of the private script and print a more informat ive message. | |
| 211 #ifndef NDEBUG | |
| 212 fprintf(stderr, "Private script throws an exception: %s\n", exceptionName.ut f8().data()); | |
|
haraken
2014/08/12 02:38:33
I used fprintf(stderr) instead of WTF_LOG_ERROR, b
| |
| 213 if (!message.isEmpty()) | |
| 214 fprintf(stderr, "%s\n", message.utf8().data()); | |
| 215 #endif | |
| 216 } | |
| 217 | |
| 218 bool PrivateScriptRunner::rethrowExceptionInPrivateScript(v8::Isolate* isolate, ExceptionState& exceptionState, v8::TryCatch& block) | |
| 219 { | |
| 220 v8::Handle<v8::Value> exception = block.Exception(); | |
| 210 if (exception.IsEmpty() || !exception->IsObject()) | 221 if (exception.IsEmpty() || !exception->IsObject()) |
| 211 return false; | 222 return false; |
| 212 | 223 |
| 213 v8::Handle<v8::Object> exceptionObject = v8::Handle<v8::Object>::Cast(except ion); | 224 v8::Handle<v8::Object> exceptionObject = v8::Handle<v8::Object>::Cast(except ion); |
| 214 v8::Handle<v8::Value> name = exceptionObject->Get(v8String(isolate, "name")) ; | 225 v8::Handle<v8::Value> name = exceptionObject->Get(v8String(isolate, "name")) ; |
| 215 if (name.IsEmpty() || !name->IsString()) | 226 if (name.IsEmpty() || !name->IsString()) |
| 216 return false; | 227 return false; |
| 217 String exceptionName = toCoreString(v8::Handle<v8::String>::Cast(name)); | 228 String exceptionName = toCoreString(v8::Handle<v8::String>::Cast(name)); |
| 218 if (exceptionName == "DOMExceptionInPrivateScript") { | 229 if (exceptionName == "DOMExceptionInPrivateScript") { |
| 219 v8::Handle<v8::Value> message = exceptionObject->Get(v8String(isolate, " message")); | 230 v8::Handle<v8::Value> v8Message = exceptionObject->Get(v8String(isolate, "message")); |
| 220 RELEASE_ASSERT(!message.IsEmpty() && message->IsString()); | 231 RELEASE_ASSERT(!v8Message.IsEmpty() && v8Message->IsString()); |
| 221 v8::Handle<v8::Value> code = exceptionObject->Get(v8String(isolate, "cod e")); | 232 v8::Handle<v8::Value> code = exceptionObject->Get(v8String(isolate, "cod e")); |
| 222 RELEASE_ASSERT(!code.IsEmpty() && code->IsInt32()); | 233 RELEASE_ASSERT(!code.IsEmpty() && code->IsInt32()); |
| 223 exceptionState.throwDOMException(toInt32(code), toCoreString(v8::Handle< v8::String>::Cast(message))); | 234 exceptionState.throwDOMException(toInt32(code), toCoreString(v8::Handle< v8::String>::Cast(v8Message))); |
| 224 exceptionState.throwIfNeeded(); | 235 exceptionState.throwIfNeeded(); |
| 225 return true; | 236 return true; |
| 226 } | 237 } |
| 227 if (exceptionName == "Error") { | 238 if (exceptionName == "Error") { |
| 228 v8::Handle<v8::Value> message = exceptionObject->Get(v8String(isolate, " message")); | 239 v8::Handle<v8::Value> v8Message = exceptionObject->Get(v8String(isolate, "message")); |
| 229 RELEASE_ASSERT(!message.IsEmpty() && message->IsString()); | 240 RELEASE_ASSERT(!v8Message.IsEmpty() && v8Message->IsString()); |
| 230 exceptionState.throwDOMException(V8GeneralError, toCoreString(v8::Handle <v8::String>::Cast(message))); | 241 String message = toCoreString(v8::Handle<v8::String>::Cast(v8Message)); |
| 242 exceptionState.throwDOMException(V8GeneralError, message); | |
| 231 exceptionState.throwIfNeeded(); | 243 exceptionState.throwIfNeeded(); |
| 244 dumpJSError(exceptionName, message); | |
| 232 return true; | 245 return true; |
| 233 } | 246 } |
| 234 if (exceptionName == "TypeError") { | 247 if (exceptionName == "TypeError") { |
| 235 v8::Handle<v8::Value> message = exceptionObject->Get(v8String(isolate, " message")); | 248 v8::Handle<v8::Value> v8Message = exceptionObject->Get(v8String(isolate, "message")); |
| 236 RELEASE_ASSERT(!message.IsEmpty() && message->IsString()); | 249 RELEASE_ASSERT(!v8Message.IsEmpty() && v8Message->IsString()); |
| 237 exceptionState.throwDOMException(V8TypeError, toCoreString(v8::Handle<v8 ::String>::Cast(message))); | 250 String message = toCoreString(v8::Handle<v8::String>::Cast(v8Message)); |
| 251 exceptionState.throwDOMException(V8TypeError, message); | |
| 238 exceptionState.throwIfNeeded(); | 252 exceptionState.throwIfNeeded(); |
| 253 dumpJSError(exceptionName, message); | |
| 239 return true; | 254 return true; |
| 240 } | 255 } |
| 241 if (exceptionName == "RangeError") { | 256 if (exceptionName == "RangeError") { |
| 242 v8::Handle<v8::Value> message = exceptionObject->Get(v8String(isolate, " message")); | 257 v8::Handle<v8::Value> v8Message = exceptionObject->Get(v8String(isolate, "message")); |
| 243 RELEASE_ASSERT(!message.IsEmpty() && message->IsString()); | 258 RELEASE_ASSERT(!v8Message.IsEmpty() && v8Message->IsString()); |
| 244 exceptionState.throwDOMException(V8RangeError, toCoreString(v8::Handle<v 8::String>::Cast(message))); | 259 String message = toCoreString(v8::Handle<v8::String>::Cast(v8Message)); |
| 260 exceptionState.throwDOMException(V8RangeError, message); | |
| 245 exceptionState.throwIfNeeded(); | 261 exceptionState.throwIfNeeded(); |
| 262 dumpJSError(exceptionName, message); | |
| 246 return true; | 263 return true; |
| 247 } | 264 } |
| 248 if (exceptionName == "SyntaxError") { | 265 if (exceptionName == "SyntaxError") { |
| 249 v8::Handle<v8::Value> message = exceptionObject->Get(v8String(isolate, " message")); | 266 v8::Handle<v8::Value> v8Message = exceptionObject->Get(v8String(isolate, "message")); |
| 250 RELEASE_ASSERT(!message.IsEmpty() && message->IsString()); | 267 RELEASE_ASSERT(!v8Message.IsEmpty() && v8Message->IsString()); |
| 251 exceptionState.throwDOMException(V8SyntaxError, toCoreString(v8::Handle< v8::String>::Cast(message))); | 268 String message = toCoreString(v8::Handle<v8::String>::Cast(v8Message)); |
| 269 exceptionState.throwDOMException(V8SyntaxError, message); | |
| 252 exceptionState.throwIfNeeded(); | 270 exceptionState.throwIfNeeded(); |
| 271 dumpJSError(exceptionName, message); | |
| 253 return true; | 272 return true; |
| 254 } | 273 } |
| 255 if (exceptionName == "ReferenceError") { | 274 if (exceptionName == "ReferenceError") { |
| 256 v8::Handle<v8::Value> message = exceptionObject->Get(v8String(isolate, " message")); | 275 v8::Handle<v8::Value> v8Message = exceptionObject->Get(v8String(isolate, "message")); |
| 257 RELEASE_ASSERT(!message.IsEmpty() && message->IsString()); | 276 RELEASE_ASSERT(!v8Message.IsEmpty() && v8Message->IsString()); |
| 258 exceptionState.throwDOMException(V8ReferenceError, toCoreString(v8::Hand le<v8::String>::Cast(message))); | 277 String message = toCoreString(v8::Handle<v8::String>::Cast(v8Message)); |
| 278 exceptionState.throwDOMException(V8ReferenceError, message); | |
| 259 exceptionState.throwIfNeeded(); | 279 exceptionState.throwIfNeeded(); |
| 280 dumpJSError(exceptionName, message); | |
| 260 return true; | 281 return true; |
| 261 } | 282 } |
| 262 return false; | 283 return false; |
| 263 } | 284 } |
| 264 | 285 |
| 265 } // namespace blink | 286 } // namespace blink |
| OLD | NEW |