Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: Source/bindings/v8/V8Initializer.cpp

Issue 20351002: Add 'error' parameter to 'window.onerror' handlers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Feedback. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "bindings/v8/V8Initializer.h" 27 #include "bindings/v8/V8Initializer.h"
28 28
29 #include "V8ErrorEvent.h"
29 #include "V8History.h" 30 #include "V8History.h"
30 #include "V8Location.h" 31 #include "V8Location.h"
31 #include "V8Window.h" 32 #include "V8Window.h"
33 #include "bindings/v8/DOMWrapperWorld.h"
32 #include "bindings/v8/ScriptCallStackFactory.h" 34 #include "bindings/v8/ScriptCallStackFactory.h"
33 #include "bindings/v8/ScriptProfiler.h" 35 #include "bindings/v8/ScriptProfiler.h"
34 #include "bindings/v8/V8Binding.h" 36 #include "bindings/v8/V8Binding.h"
35 #include "bindings/v8/V8GCController.h" 37 #include "bindings/v8/V8GCController.h"
38 #include "bindings/v8/V8HiddenPropertyName.h"
36 #include "bindings/v8/V8PerContextData.h" 39 #include "bindings/v8/V8PerContextData.h"
37 #include "core/dom/Document.h" 40 #include "core/dom/Document.h"
38 #include "core/dom/ExceptionCode.h" 41 #include "core/dom/ExceptionCode.h"
39 #include "core/inspector/ScriptCallStack.h" 42 #include "core/inspector/ScriptCallStack.h"
40 #include "core/page/ConsoleTypes.h" 43 #include "core/page/ConsoleTypes.h"
41 #include "core/page/ContentSecurityPolicy.h" 44 #include "core/page/ContentSecurityPolicy.h"
42 #include "core/page/DOMWindow.h" 45 #include "core/page/DOMWindow.h"
43 #include "core/page/Frame.h" 46 #include "core/page/Frame.h"
44 #include "core/platform/MemoryUsageSupport.h" 47 #include "core/platform/MemoryUsageSupport.h"
45 #include <v8-debug.h> 48 #include <v8-debug.h>
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 90
88 v8::Handle<v8::StackTrace> stackTrace = message->GetStackTrace(); 91 v8::Handle<v8::StackTrace> stackTrace = message->GetStackTrace();
89 RefPtr<ScriptCallStack> callStack; 92 RefPtr<ScriptCallStack> callStack;
90 // Currently stack trace is only collected when inspector is open. 93 // Currently stack trace is only collected when inspector is open.
91 if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0) 94 if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0)
92 callStack = createScriptCallStack(stackTrace, ScriptCallStack::maxCallSt ackSizeToCapture); 95 callStack = createScriptCallStack(stackTrace, ScriptCallStack::maxCallSt ackSizeToCapture);
93 96
94 v8::Handle<v8::Value> resourceName = message->GetScriptResourceName(); 97 v8::Handle<v8::Value> resourceName = message->GetScriptResourceName();
95 bool shouldUseDocumentURL = resourceName.IsEmpty() || !resourceName->IsStrin g(); 98 bool shouldUseDocumentURL = resourceName.IsEmpty() || !resourceName->IsStrin g();
96 String resource = shouldUseDocumentURL ? firstWindow->document()->url() : to WebCoreString(resourceName); 99 String resource = shouldUseDocumentURL ? firstWindow->document()->url() : to WebCoreString(resourceName);
97 firstWindow->document()->reportException(errorMessage, message->GetLineNumbe r(), message->GetStartColumn(), resource, callStack); 100 RefPtr<ErrorEvent> event = ErrorEvent::create(errorMessage, resource, messag e->GetLineNumber(), message->GetStartColumn());
101 v8::Local<v8::Value> wrappedEvent = toV8(event.get(), v8::Handle<v8::Object> (), v8::Isolate::GetCurrent());
102 if (!wrappedEvent.IsEmpty()) {
103 ASSERT(wrappedEvent->IsObject());
104 v8::Local<v8::Object>::Cast(wrappedEvent)->SetHiddenValue(V8HiddenProper tyName::error(), data);
105 }
106 firstWindow->document()->reportException(event.release(), callStack);
98 } 107 }
99 108
100 static void failedAccessCheckCallbackInMainThread(v8::Local<v8::Object> host, v8 ::AccessType type, v8::Local<v8::Value> data) 109 static void failedAccessCheckCallbackInMainThread(v8::Local<v8::Object> host, v8 ::AccessType type, v8::Local<v8::Value> data)
101 { 110 {
102 Frame* target = findFrame(host, data, v8::Isolate::GetCurrent()); 111 Frame* target = findFrame(host, data, v8::Isolate::GetCurrent());
103 if (!target) 112 if (!target)
104 return; 113 return;
105 DOMWindow* targetWindow = target->domWindow(); 114 DOMWindow* targetWindow = target->domWindow();
106 115
107 setDOMException(SecurityError, targetWindow->crossDomainAccessErrorMessage(a ctiveDOMWindow()), v8::Isolate::GetCurrent()); 116 setDOMException(SecurityError, targetWindow->crossDomainAccessErrorMessage(a ctiveDOMWindow()), v8::Isolate::GetCurrent());
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 static bool isReportingException = false; 164 static bool isReportingException = false;
156 // Exceptions that occur in error handler should be ignored since in that ca se 165 // Exceptions that occur in error handler should be ignored since in that ca se
157 // WorkerGlobalScope::reportException will send the exception to the worker object. 166 // WorkerGlobalScope::reportException will send the exception to the worker object.
158 if (isReportingException) 167 if (isReportingException)
159 return; 168 return;
160 isReportingException = true; 169 isReportingException = true;
161 170
162 // During the frame teardown, there may not be a valid context. 171 // During the frame teardown, there may not be a valid context.
163 if (ScriptExecutionContext* context = getScriptExecutionContext()) { 172 if (ScriptExecutionContext* context = getScriptExecutionContext()) {
164 String errorMessage = toWebCoreString(message->Get()); 173 String errorMessage = toWebCoreString(message->Get());
165 int lineNumber = message->GetLineNumber();
166 int columnNumber = message->GetStartColumn();
167 String sourceURL = toWebCoreString(message->GetScriptResourceName()); 174 String sourceURL = toWebCoreString(message->GetScriptResourceName());
168 context->reportException(errorMessage, lineNumber, columnNumber, sourceU RL, 0); 175 RefPtr<ErrorEvent> event = ErrorEvent::create(errorMessage, sourceURL, m essage->GetLineNumber(), message->GetStartColumn());
176 v8::Local<v8::Value> wrappedEvent = toV8(event.get(), v8::Handle<v8::Obj ect>(), v8::Isolate::GetCurrent());
177 if (!wrappedEvent.IsEmpty()) {
178 ASSERT(wrappedEvent->IsObject());
179 v8::Local<v8::Object>::Cast(wrappedEvent)->SetHiddenValue(V8HiddenPr opertyName::error(), data);
180 }
181 context->reportException(event.release(), 0);
169 } 182 }
170 183
171 isReportingException = false; 184 isReportingException = false;
172 } 185 }
173 186
174 static const int kWorkerMaxStackSize = 500 * 1024; 187 static const int kWorkerMaxStackSize = 500 * 1024;
175 188
176 void V8Initializer::initializeWorker(v8::Isolate* isolate) 189 void V8Initializer::initializeWorker(v8::Isolate* isolate)
177 { 190 {
178 initializeV8Common(); 191 initializeV8Common();
179 192
180 v8::V8::AddMessageListener(messageHandlerInWorker); 193 v8::V8::AddMessageListener(messageHandlerInWorker);
181 v8::V8::SetFatalErrorHandler(reportFatalErrorInWorker); 194 v8::V8::SetFatalErrorHandler(reportFatalErrorInWorker);
182 195
183 v8::ResourceConstraints resourceConstraints; 196 v8::ResourceConstraints resourceConstraints;
184 uint32_t here; 197 uint32_t here;
185 resourceConstraints.set_stack_limit(&here - kWorkerMaxStackSize / sizeof(uin t32_t*)); 198 resourceConstraints.set_stack_limit(&here - kWorkerMaxStackSize / sizeof(uin t32_t*));
186 v8::SetResourceConstraints(&resourceConstraints); 199 v8::SetResourceConstraints(&resourceConstraints);
187 200
188 V8PerIsolateData::ensureInitialized(isolate); 201 V8PerIsolateData::ensureInitialized(isolate);
189 } 202 }
190 203
191 } // namespace WebCore 204 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698