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

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp

Issue 2244203002: Fix "report the exception" in Custom Elements V1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Renamed to ErrorEventDispatcher Created 4 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
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 "bindings/core/v8/V8Initializer.h" 26 #include "bindings/core/v8/V8Initializer.h"
27 27
28 #include "bindings/core/v8/DOMWrapperWorld.h" 28 #include "bindings/core/v8/DOMWrapperWorld.h"
29 #include "bindings/core/v8/ErrorEventDispatcher.h"
29 #include "bindings/core/v8/RejectedPromises.h" 30 #include "bindings/core/v8/RejectedPromises.h"
30 #include "bindings/core/v8/RetainedDOMInfo.h" 31 #include "bindings/core/v8/RetainedDOMInfo.h"
31 #include "bindings/core/v8/ScriptController.h" 32 #include "bindings/core/v8/ScriptController.h"
32 #include "bindings/core/v8/ScriptValue.h" 33 #include "bindings/core/v8/ScriptValue.h"
33 #include "bindings/core/v8/SourceLocation.h" 34 #include "bindings/core/v8/SourceLocation.h"
34 #include "bindings/core/v8/V8Binding.h" 35 #include "bindings/core/v8/V8Binding.h"
35 #include "bindings/core/v8/V8DOMException.h" 36 #include "bindings/core/v8/V8DOMException.h"
36 #include "bindings/core/v8/V8ErrorEvent.h" 37 #include "bindings/core/v8/V8ErrorEvent.h"
37 #include "bindings/core/v8/V8ErrorHandler.h" 38 #include "bindings/core/v8/V8ErrorHandler.h"
38 #include "bindings/core/v8/V8GCController.h" 39 #include "bindings/core/v8/V8GCController.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 if (isolate->GetEnteredContext().IsEmpty()) 126 if (isolate->GetEnteredContext().IsEmpty())
126 return; 127 return;
127 128
128 // If called during context initialization, there will be no entered context . 129 // If called during context initialization, there will be no entered context .
129 ScriptState* scriptState = ScriptState::current(isolate); 130 ScriptState* scriptState = ScriptState::current(isolate);
130 if (!scriptState->contextIsValid()) 131 if (!scriptState->contextIsValid())
131 return; 132 return;
132 133
133 ExecutionContext* context = scriptState->getExecutionContext(); 134 ExecutionContext* context = scriptState->getExecutionContext();
134 std::unique_ptr<SourceLocation> location = SourceLocation::fromMessage(isola te, message, context); 135 std::unique_ptr<SourceLocation> location = SourceLocation::fromMessage(isola te, message, context);
135 136 AccessControlStatus accessControlStatus =
136 AccessControlStatus accessControlStatus = NotSharableCrossOrigin; 137 ErrorEventDispatcher::accessControlStatusFromScriptOriginOptions(
137 if (message->IsOpaque()) 138 message->GetScriptOrigin().Options());
138 accessControlStatus = OpaqueResource;
139 else if (message->IsSharedCrossOrigin())
140 accessControlStatus = SharableCrossOrigin;
141 139
142 ErrorEvent* event = ErrorEvent::create(toCoreStringWithNullCheck(message->Ge t()), std::move(location), &scriptState->world()); 140 ErrorEvent* event = ErrorEvent::create(toCoreStringWithNullCheck(message->Ge t()), std::move(location), &scriptState->world());
143 141
144 String messageForConsole = extractMessageForConsole(isolate, data); 142 String messageForConsole = extractMessageForConsole(isolate, data);
145 if (!messageForConsole.isEmpty()) 143 if (!messageForConsole.isEmpty())
146 event->setUnsanitizedMessage("Uncaught " + messageForConsole); 144 event->setUnsanitizedMessage("Uncaught " + messageForConsole);
147 145
148 // This method might be called while we're creating a new context. In this c ase, we 146 // This method might be called while we're creating a new context. In this c ase, we
149 // avoid storing the exception object, as we can't create a wrapper during c ontext creation. 147 // avoid storing the exception object, as we can't create a wrapper during c ontext creation.
150 // FIXME: Can we even get here during initialization now that we bail out wh en GetEntered returns an empty handle? 148 // FIXME: Can we even get here during initialization now that we bail out wh en GetEntered returns an empty handle?
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 451
454 isolate->AddMessageListener(messageHandlerInWorker); 452 isolate->AddMessageListener(messageHandlerInWorker);
455 isolate->SetFatalErrorHandler(reportFatalErrorInWorker); 453 isolate->SetFatalErrorHandler(reportFatalErrorInWorker);
456 454
457 uint32_t here; 455 uint32_t here;
458 isolate->SetStackLimit(reinterpret_cast<uintptr_t>(&here - kWorkerMaxStackSi ze / sizeof(uint32_t*))); 456 isolate->SetStackLimit(reinterpret_cast<uintptr_t>(&here - kWorkerMaxStackSi ze / sizeof(uint32_t*)));
459 isolate->SetPromiseRejectCallback(promiseRejectHandlerInWorker); 457 isolate->SetPromiseRejectCallback(promiseRejectHandlerInWorker);
460 } 458 }
461 459
462 } // namespace blink 460 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698