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

Unified Diff: Source/core/dom/Document.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/dom/ContextLifecycleObserver.cpp ('k') | Source/core/dom/Document.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Document.h
diff --git a/Source/core/dom/Document.h b/Source/core/dom/Document.h
index db8a9538b3bc4e32b91ee151aaff686bedc8c68e..cf4290f5b6b439a1735780fee03104dedc0428ac 100644
--- a/Source/core/dom/Document.h
+++ b/Source/core/dom/Document.h
@@ -36,7 +36,6 @@
#include "core/dom/DocumentEncodingData.h"
#include "core/dom/DocumentInit.h"
#include "core/dom/DocumentLifecycle.h"
-#include "core/dom/DocumentLifecycleNotifier.h"
#include "core/dom/DocumentSupplementable.h"
#include "core/dom/DocumentTiming.h"
#include "core/dom/ExecutionContext.h"
@@ -82,6 +81,7 @@ class CustomElementRegistrationContext;
class DOMImplementation;
class DOMWindow;
class DocumentFragment;
+class DocumentLifecycleNotifier;
class DocumentLoader;
class DocumentMarkerController;
class DocumentNameCollection;
@@ -219,7 +219,7 @@ private:
};
class Document : public ContainerNode, public TreeScope, public SecurityContext, public ExecutionContext
- , public DocumentSupplementable, public DocumentLifecycleNotifier {
+ , public DocumentSupplementable, public LifecycleContext<Document> {
DEFINE_WRAPPERTYPEINFO();
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Document);
public:
@@ -1022,6 +1022,7 @@ public:
virtual LocalDOMWindow* executingWindow() override final;
LocalFrame* executingFrame();
+ DocumentLifecycleNotifier& lifecycleNotifier();
DocumentLifecycle& lifecycle() { return m_lifecycle; }
bool isActive() const { return m_lifecycle.isActive(); }
bool isDetached() const { return m_lifecycle.state() >= DocumentLifecycle::Stopping; }
@@ -1035,6 +1036,7 @@ public:
void maybeHandleHttpRefresh(const String&, HttpRefreshType);
void updateSecurityOrigin(PassRefPtr<SecurityOrigin>);
+ PassOwnPtr<LifecycleNotifier<Document>> createLifecycleNotifier();
void setHasViewportUnits() { m_hasViewportUnits = true; }
bool hasViewportUnits() const { return m_hasViewportUnits; }
« no previous file with comments | « Source/core/dom/ContextLifecycleObserver.cpp ('k') | Source/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698