| Index: Source/core/frame/LocalDOMWindow.cpp
|
| diff --git a/Source/core/frame/LocalDOMWindow.cpp b/Source/core/frame/LocalDOMWindow.cpp
|
| index ce4d6e19c722ea7add698df8c837c07b1bf1cd6e..cff760e3734679b14ffc505668e66fed61f03c79 100644
|
| --- a/Source/core/frame/LocalDOMWindow.cpp
|
| +++ b/Source/core/frame/LocalDOMWindow.cpp
|
| @@ -48,7 +48,6 @@
|
| #include "core/dom/Element.h"
|
| #include "core/dom/ExceptionCode.h"
|
| #include "core/dom/ExecutionContext.h"
|
| -#include "core/dom/NoEventDispatchAssertion.h"
|
| #include "core/dom/RequestAnimationFrameCallback.h"
|
| #include "core/editing/Editor.h"
|
| #include "core/events/DOMWindowEventQueue.h"
|
| @@ -95,6 +94,7 @@
|
| #include "core/storage/StorageArea.h"
|
| #include "core/storage/StorageNamespace.h"
|
| #include "core/timing/Performance.h"
|
| +#include "platform/EventDispatchForbiddenScope.h"
|
| #include "platform/PlatformScreen.h"
|
| #include "platform/RuntimeEnabledFeatures.h"
|
| #include "platform/UserGestureIndicator.h"
|
| @@ -451,7 +451,7 @@ void LocalDOMWindow::enqueueDocumentEvent(PassRefPtrWillBeRawPtr<Event> event)
|
|
|
| void LocalDOMWindow::dispatchWindowLoadEvent()
|
| {
|
| - ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
|
| + ASSERT(!EventDispatchForbiddenScope::isEventDispatchForbidden());
|
| dispatchLoadEvent();
|
| }
|
|
|
| @@ -1600,7 +1600,7 @@ void LocalDOMWindow::dispatchLoadEvent()
|
|
|
| bool LocalDOMWindow::dispatchEvent(PassRefPtrWillBeRawPtr<Event> prpEvent, PassRefPtrWillBeRawPtr<EventTarget> prpTarget)
|
| {
|
| - ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
|
| + ASSERT(!EventDispatchForbiddenScope::isEventDispatchForbidden());
|
|
|
| RefPtrWillBeRawPtr<EventTarget> protect(this);
|
| RefPtrWillBeRawPtr<Event> event = prpEvent;
|
|
|