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

Unified Diff: third_party/WebKit/Source/modules/presentation/PresentationController.cpp

Issue 2569963003: Remove DOMWindowProperty from PresentationController (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « third_party/WebKit/Source/modules/presentation/PresentationController.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/presentation/PresentationController.cpp
diff --git a/third_party/WebKit/Source/modules/presentation/PresentationController.cpp b/third_party/WebKit/Source/modules/presentation/PresentationController.cpp
index 7794675c11459cbdea3ab766dd5fa6aebee6a58b..65d4edecad0fbfcede0a233126b2afe3d2d6efb7 100644
--- a/third_party/WebKit/Source/modules/presentation/PresentationController.cpp
+++ b/third_party/WebKit/Source/modules/presentation/PresentationController.cpp
@@ -4,6 +4,7 @@
#include "modules/presentation/PresentationController.h"
+#include "core/dom/Document.h"
#include "core/frame/LocalFrame.h"
#include "modules/presentation/PresentationConnection.h"
#include "public/platform/modules/presentation/WebPresentationClient.h"
@@ -14,7 +15,7 @@ namespace blink {
PresentationController::PresentationController(LocalFrame& frame,
WebPresentationClient* client)
- : DOMWindowProperty(&frame), m_client(client) {
+ : ContextLifecycleObserver(frame.document()), m_client(client) {
if (m_client)
m_client->setController(this);
}
@@ -58,7 +59,7 @@ DEFINE_TRACE(PresentationController) {
visitor->trace(m_presentation);
visitor->trace(m_connections);
Supplement<LocalFrame>::trace(visitor);
- DOMWindowProperty::trace(visitor);
+ ContextLifecycleObserver::trace(visitor);
}
void PresentationController::didStartDefaultSession(
@@ -140,12 +141,11 @@ void PresentationController::registerConnection(
m_connections.add(connection);
}
-void PresentationController::frameDestroyed() {
+void PresentationController::contextDestroyed() {
if (m_client) {
m_client->setController(nullptr);
m_client = nullptr;
}
- DOMWindowProperty::frameDestroyed();
}
PresentationConnection* PresentationController::findConnection(
« no previous file with comments | « third_party/WebKit/Source/modules/presentation/PresentationController.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698