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

Unified Diff: third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp

Issue 2741633002: Remove FrameHost::eventHandlerRegistry() (Closed)
Patch Set: Rebase Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
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 5cf10db20ad25c2f404477cb334bb197b841ab36..2650b242b860959623b5e5680fd71e6603d72ff7 100644
--- a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
@@ -1414,8 +1414,8 @@ void LocalDOMWindow::addedEventListener(
const AtomicString& eventType,
RegisteredEventListener& registeredListener) {
DOMWindow::addedEventListener(eventType, registeredListener);
- if (frame() && frame()->host())
- frame()->host()->eventHandlerRegistry().didAddEventHandler(
+ if (frame() && frame()->page())
+ frame()->page()->eventHandlerRegistry().didAddEventHandler(
*this, eventType, registeredListener.options());
if (Document* document = this->document())
@@ -1447,8 +1447,8 @@ void LocalDOMWindow::removedEventListener(
const AtomicString& eventType,
const RegisteredEventListener& registeredListener) {
DOMWindow::removedEventListener(eventType, registeredListener);
- if (frame() && frame()->host())
- frame()->host()->eventHandlerRegistry().didRemoveEventHandler(
+ if (frame() && frame()->page())
+ frame()->page()->eventHandlerRegistry().didRemoveEventHandler(
*this, eventType, registeredListener.options());
for (auto& it : m_eventListenerObservers) {
@@ -1544,8 +1544,8 @@ void LocalDOMWindow::removeAllEventListeners() {
it->didRemoveAllEventListeners(this);
}
- if (frame() && frame()->host())
- frame()->host()->eventHandlerRegistry().didRemoveAllEventHandlers(*this);
+ if (frame() && frame()->page())
+ frame()->page()->eventHandlerRegistry().didRemoveAllEventHandlers(*this);
removeAllUnloadEventListeners(this);
removeAllBeforeUnloadEventListeners(this);
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.cpp ('k') | third_party/WebKit/Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698