| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 // Currently stack trace is only collected when inspector is open. | 105 // Currently stack trace is only collected when inspector is open. |
| 106 if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0) | 106 if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0) |
| 107 callStack = createScriptCallStack(stackTrace, ScriptCallStack::maxCallSt
ackSizeToCapture, isolate); | 107 callStack = createScriptCallStack(stackTrace, ScriptCallStack::maxCallSt
ackSizeToCapture, isolate); |
| 108 | 108 |
| 109 v8::Handle<v8::Value> resourceName = message->GetScriptResourceName(); | 109 v8::Handle<v8::Value> resourceName = message->GetScriptResourceName(); |
| 110 bool shouldUseDocumentURL = resourceName.IsEmpty() || !resourceName->IsStrin
g(); | 110 bool shouldUseDocumentURL = resourceName.IsEmpty() || !resourceName->IsStrin
g(); |
| 111 String resource = shouldUseDocumentURL ? enteredWindow->document()->url() :
toCoreString(resourceName.As<v8::String>()); | 111 String resource = shouldUseDocumentURL ? enteredWindow->document()->url() :
toCoreString(resourceName.As<v8::String>()); |
| 112 AccessControlStatus corsStatus = message->IsSharedCrossOrigin() ? SharableCr
ossOrigin : NotSharableCrossOrigin; | 112 AccessControlStatus corsStatus = message->IsSharedCrossOrigin() ? SharableCr
ossOrigin : NotSharableCrossOrigin; |
| 113 | 113 |
| 114 DOMWrapperWorld& world = DOMWrapperWorld::current(isolate); | 114 DOMWrapperWorld& world = DOMWrapperWorld::current(isolate); |
| 115 RefPtr<ErrorEvent> event = ErrorEvent::create(errorMessage, resource, messag
e->GetLineNumber(), message->GetStartColumn() + 1, &world); | 115 RefPtrWillBeRawPtr<ErrorEvent> event = ErrorEvent::create(errorMessage, reso
urce, message->GetLineNumber(), message->GetStartColumn() + 1, &world); |
| 116 if (V8DOMWrapper::isDOMWrapper(data)) { | 116 if (V8DOMWrapper::isDOMWrapper(data)) { |
| 117 v8::Handle<v8::Object> obj = v8::Handle<v8::Object>::Cast(data); | 117 v8::Handle<v8::Object> obj = v8::Handle<v8::Object>::Cast(data); |
| 118 const WrapperTypeInfo* type = toWrapperTypeInfo(obj); | 118 const WrapperTypeInfo* type = toWrapperTypeInfo(obj); |
| 119 if (V8DOMException::wrapperTypeInfo.isSubclass(type)) { | 119 if (V8DOMException::wrapperTypeInfo.isSubclass(type)) { |
| 120 DOMException* exception = V8DOMException::toNative(obj); | 120 DOMException* exception = V8DOMException::toNative(obj); |
| 121 if (exception && !exception->messageForConsole().isEmpty()) | 121 if (exception && !exception->messageForConsole().isEmpty()) |
| 122 event->setUnsanitizedMessage("Uncaught " + exception->toStringFo
rConsole()); | 122 event->setUnsanitizedMessage("Uncaught " + exception->toStringFo
rConsole()); |
| 123 } | 123 } |
| 124 } | 124 } |
| 125 | 125 |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 if (isReportingException) | 215 if (isReportingException) |
| 216 return; | 216 return; |
| 217 isReportingException = true; | 217 isReportingException = true; |
| 218 | 218 |
| 219 v8::Isolate* isolate = v8::Isolate::GetCurrent(); | 219 v8::Isolate* isolate = v8::Isolate::GetCurrent(); |
| 220 // During the frame teardown, there may not be a valid context. | 220 // During the frame teardown, there may not be a valid context. |
| 221 if (ExecutionContext* context = currentExecutionContext(isolate)) { | 221 if (ExecutionContext* context = currentExecutionContext(isolate)) { |
| 222 String errorMessage = toCoreString(message->Get()); | 222 String errorMessage = toCoreString(message->Get()); |
| 223 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, sourceURL, mess
age->GetScriptResourceName()); | 223 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, sourceURL, mess
age->GetScriptResourceName()); |
| 224 | 224 |
| 225 RefPtr<ErrorEvent> event = ErrorEvent::create(errorMessage, sourceURL, m
essage->GetLineNumber(), message->GetStartColumn() + 1, &DOMWrapperWorld::curren
t(isolate)); | 225 RefPtrWillBeRawPtr<ErrorEvent> event = ErrorEvent::create(errorMessage,
sourceURL, message->GetLineNumber(), message->GetStartColumn() + 1, &DOMWrapperW
orld::current(isolate)); |
| 226 AccessControlStatus corsStatus = message->IsSharedCrossOrigin() ? Sharab
leCrossOrigin : NotSharableCrossOrigin; | 226 AccessControlStatus corsStatus = message->IsSharedCrossOrigin() ? Sharab
leCrossOrigin : NotSharableCrossOrigin; |
| 227 | 227 |
| 228 V8ErrorHandler::storeExceptionOnErrorEventWrapper(event.get(), data, iso
late); | 228 V8ErrorHandler::storeExceptionOnErrorEventWrapper(event.get(), data, iso
late); |
| 229 context->reportException(event.release(), nullptr, corsStatus); | 229 context->reportException(event.release(), nullptr, corsStatus); |
| 230 } | 230 } |
| 231 | 231 |
| 232 isReportingException = false; | 232 isReportingException = false; |
| 233 } | 233 } |
| 234 | 234 |
| 235 static const int kWorkerMaxStackSize = 500 * 1024; | 235 static const int kWorkerMaxStackSize = 500 * 1024; |
| 236 | 236 |
| 237 void V8Initializer::initializeWorker(v8::Isolate* isolate) | 237 void V8Initializer::initializeWorker(v8::Isolate* isolate) |
| 238 { | 238 { |
| 239 initializeV8Common(isolate); | 239 initializeV8Common(isolate); |
| 240 | 240 |
| 241 v8::V8::AddMessageListener(messageHandlerInWorker); | 241 v8::V8::AddMessageListener(messageHandlerInWorker); |
| 242 v8::V8::SetFatalErrorHandler(reportFatalErrorInWorker); | 242 v8::V8::SetFatalErrorHandler(reportFatalErrorInWorker); |
| 243 | 243 |
| 244 v8::ResourceConstraints resourceConstraints; | 244 v8::ResourceConstraints resourceConstraints; |
| 245 uint32_t here; | 245 uint32_t here; |
| 246 resourceConstraints.set_stack_limit(&here - kWorkerMaxStackSize / sizeof(uin
t32_t*)); | 246 resourceConstraints.set_stack_limit(&here - kWorkerMaxStackSize / sizeof(uin
t32_t*)); |
| 247 v8::SetResourceConstraints(isolate, &resourceConstraints); | 247 v8::SetResourceConstraints(isolate, &resourceConstraints); |
| 248 } | 248 } |
| 249 | 249 |
| 250 } // namespace WebCore | 250 } // namespace WebCore |
| OLD | NEW |