| Index: Source/core/events/EventTarget.cpp
|
| diff --git a/Source/core/events/EventTarget.cpp b/Source/core/events/EventTarget.cpp
|
| index 87944debdc43d2e1b8b267557d1ba4484038ccd8..04dea3543ffdb259d87b8701a23756dc3cf6287f 100644
|
| --- a/Source/core/events/EventTarget.cpp
|
| +++ b/Source/core/events/EventTarget.cpp
|
| @@ -38,7 +38,7 @@
|
| #include "core/editing/Editor.h"
|
| #include "core/events/Event.h"
|
| #include "core/inspector/InspectorInstrumentation.h"
|
| -#include "core/frame/DOMWindow.h"
|
| +#include "core/frame/LocalDOMWindow.h"
|
| #include "platform/RuntimeEnabledFeatures.h"
|
| #include "wtf/StdLibExtras.h"
|
| #include "wtf/Vector.h"
|
| @@ -64,7 +64,7 @@ Node* EventTarget::toNode()
|
| return 0;
|
| }
|
|
|
| -DOMWindow* EventTarget::toDOMWindow()
|
| +LocalDOMWindow* EventTarget::toDOMWindow()
|
| {
|
| return 0;
|
| }
|
| @@ -74,7 +74,7 @@ MessagePort* EventTarget::toMessagePort()
|
| return 0;
|
| }
|
|
|
| -inline DOMWindow* EventTarget::executingWindow()
|
| +inline LocalDOMWindow* EventTarget::executingWindow()
|
| {
|
| if (ExecutionContext* context = executionContext())
|
| return context->executingWindow();
|
| @@ -233,7 +233,7 @@ void EventTarget::countLegacyEvents(const AtomicString& legacyTypeName, EventLis
|
| }
|
|
|
| if (shouldCount) {
|
| - if (DOMWindow* executingWindow = this->executingWindow()) {
|
| + if (LocalDOMWindow* executingWindow = this->executingWindow()) {
|
| if (legacyListenersVector) {
|
| if (listenersVector)
|
| UseCounter::count(executingWindow->document(), prefixedAndUnprefixedFeature);
|
| @@ -294,19 +294,19 @@ void EventTarget::fireEventListeners(Event* event, EventTargetData* d, EventList
|
| // new event listeners.
|
|
|
| if (event->type() == EventTypeNames::beforeunload) {
|
| - if (DOMWindow* executingWindow = this->executingWindow()) {
|
| + if (LocalDOMWindow* executingWindow = this->executingWindow()) {
|
| if (executingWindow->top())
|
| UseCounter::count(executingWindow->document(), UseCounter::SubFrameBeforeUnloadFired);
|
| UseCounter::count(executingWindow->document(), UseCounter::DocumentBeforeUnloadFired);
|
| }
|
| } else if (event->type() == EventTypeNames::unload) {
|
| - if (DOMWindow* executingWindow = this->executingWindow())
|
| + if (LocalDOMWindow* executingWindow = this->executingWindow())
|
| UseCounter::count(executingWindow->document(), UseCounter::DocumentUnloadFired);
|
| } else if (event->type() == EventTypeNames::DOMFocusIn || event->type() == EventTypeNames::DOMFocusOut) {
|
| - if (DOMWindow* executingWindow = this->executingWindow())
|
| + if (LocalDOMWindow* executingWindow = this->executingWindow())
|
| UseCounter::count(executingWindow->document(), UseCounter::DOMFocusInOutEvent);
|
| } else if (event->type() == EventTypeNames::focusin || event->type() == EventTypeNames::focusout) {
|
| - if (DOMWindow* executingWindow = this->executingWindow())
|
| + if (LocalDOMWindow* executingWindow = this->executingWindow())
|
| UseCounter::count(executingWindow->document(), UseCounter::FocusInOutEvent);
|
| }
|
|
|
|
|