| Index: third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
|
| index 0973ebc02c37956d9b0348d6c97bed8a8ae39ccc..3be0d1adada18fc29fc72495b0a20a1b54939f2f 100644
|
| --- a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
|
| @@ -376,7 +376,9 @@ void LocalDOMWindow::enqueueDocumentEvent(Event* event) {
|
| }
|
|
|
| void LocalDOMWindow::dispatchWindowLoadEvent() {
|
| - ASSERT(!EventDispatchForbiddenScope::isEventDispatchForbidden());
|
| +#if DCHECK_IS_ON()
|
| + DCHECK(!EventDispatchForbiddenScope::isEventDispatchForbidden());
|
| +#endif
|
| // Delay 'load' event if we are in EventQueueScope. This is a short-term
|
| // workaround to avoid Editing code crashes. We should always dispatch
|
| // 'load' event asynchronously. crbug.com/569511.
|
| @@ -1419,7 +1421,9 @@ void LocalDOMWindow::dispatchLoadEvent() {
|
|
|
| DispatchEventResult LocalDOMWindow::dispatchEvent(Event* event,
|
| EventTarget* target) {
|
| - ASSERT(!EventDispatchForbiddenScope::isEventDispatchForbidden());
|
| +#if DCHECK_IS_ON()
|
| + DCHECK(!EventDispatchForbiddenScope::isEventDispatchForbidden());
|
| +#endif
|
|
|
| event->setTrusted(true);
|
| event->setTarget(target ? target : this);
|
|
|