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

Unified Diff: Source/core/frame/LocalDOMWindow.h

Issue 901663005: Revert r189385 "Remove LifecycleContext" and r189391, r189530, r189456 that block it (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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
« no previous file with comments | « Source/core/frame/DOMWindowLifecycleObserver.cpp ('k') | Source/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/LocalDOMWindow.h
diff --git a/Source/core/frame/LocalDOMWindow.h b/Source/core/frame/LocalDOMWindow.h
index 4ee59a6f89742b01c460db634f7a548ba67a4151..573260a0c8f3e770e7dc9930fef1e1a9cba5256d 100644
--- a/Source/core/frame/LocalDOMWindow.h
+++ b/Source/core/frame/LocalDOMWindow.h
@@ -29,9 +29,9 @@
#include "core/events/EventTarget.h"
#include "core/frame/DOMWindow.h"
-#include "core/frame/DOMWindowLifecycleNotifier.h"
#include "core/frame/FrameDestructionObserver.h"
#include "core/frame/LocalFrame.h"
+#include "platform/LifecycleContext.h"
#include "platform/Supplementable.h"
#include "platform/heap/Handle.h"
@@ -41,6 +41,7 @@
namespace blink {
class DOMWindowEventQueue;
+class DOMWindowLifecycleNotifier;
class DOMWindowProperty;
class DocumentInit;
class EventListener;
@@ -60,7 +61,7 @@ enum PageshowEventPersistence {
// Note: if you're thinking of returning something DOM-related by reference,
// please ping dcheng@chromium.org first. You probably don't want to do that.
-class LocalDOMWindow final : public DOMWindow, public WillBeHeapSupplementable<LocalDOMWindow>, public DOMWindowLifecycleNotifier {
+class LocalDOMWindow final : public DOMWindow, public WillBeHeapSupplementable<LocalDOMWindow>, public LifecycleContext<LocalDOMWindow> {
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LocalDOMWindow);
public:
static PassRefPtrWillBeRawPtr<Document> createDocument(const String& mimeType, const DocumentInit&, bool forceXHTML);
@@ -198,6 +199,8 @@ public:
bool isInsecureScriptAccess(DOMWindow& callingWindow, const String& urlString) override;
+ PassOwnPtr<LifecycleNotifier<LocalDOMWindow>> createLifecycleNotifier();
+
EventQueue* eventQueue() const;
void enqueueWindowEvent(PassRefPtrWillBeRawPtr<Event>);
void enqueueDocumentEvent(PassRefPtrWillBeRawPtr<Event>);
@@ -215,6 +218,9 @@ public:
virtual v8::Handle<v8::Object> wrap(v8::Handle<v8::Object> creationContext, v8::Isolate*) override;
+protected:
+ DOMWindowLifecycleNotifier& lifecycleNotifier();
+
private:
// Rather than simply inheriting FrameDestructionObserver like most other
// classes, LocalDOMWindow hides its FrameDestructionObserver with
« no previous file with comments | « Source/core/frame/DOMWindowLifecycleObserver.cpp ('k') | Source/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698