diff options
author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-21 14:09:57 +0100 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 15:14:36 +0100 |
commit | eb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch) | |
tree | 2c7c940e1dbee81b89d935626110816b494aa32c /chromium/third_party/WebKit/Source/core/page/DOMWindow.h | |
parent | 9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff) | |
download | qtwebengine-chromium-eb32ba6f51d0c21d58cd7d89785285ff8fa64624.tar.gz |
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/page/DOMWindow.h')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/page/DOMWindow.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chromium/third_party/WebKit/Source/core/page/DOMWindow.h b/chromium/third_party/WebKit/Source/core/page/DOMWindow.h index 8a1df0ed226..ae98cf0a1fb 100644 --- a/chromium/third_party/WebKit/Source/core/page/DOMWindow.h +++ b/chromium/third_party/WebKit/Source/core/page/DOMWindow.h @@ -30,7 +30,6 @@ #include "bindings/v8/ScriptWrappable.h" #include "core/dom/EventTarget.h" #include "core/page/FrameDestructionObserver.h" -#include "core/platform/LifecycleContext.h" #include "core/platform/Supplementable.h" #include "wtf/Forward.h" @@ -48,7 +47,6 @@ namespace WebCore { class Database; class DatabaseCallback; class Document; - class DOMWindowLifecycleNotifier; class Element; class EventListener; class ExceptionState; @@ -81,7 +79,7 @@ namespace WebCore { enum SetLocationLocking { LockHistoryBasedOnGestureState, LockHistoryAndBackForwardList }; - class DOMWindow : public RefCounted<DOMWindow>, public ScriptWrappable, public EventTarget, public FrameDestructionObserver, public Supplementable<DOMWindow>, public LifecycleContext { + class DOMWindow : public RefCounted<DOMWindow>, public ScriptWrappable, public EventTarget, public FrameDestructionObserver, public Supplementable<DOMWindow> { public: static PassRefPtr<DOMWindow> create(Frame* frame) { return adoptRef(new DOMWindow(frame)); } virtual ~DOMWindow(); @@ -374,16 +372,11 @@ namespace WebCore { bool isInsecureScriptAccess(DOMWindow* activeWindow, const String& urlString); - protected: - DOMWindowLifecycleNotifier* lifecycleNotifier(); - private: explicit DOMWindow(Frame*); Page* page(); - virtual PassOwnPtr<LifecycleNotifier> createLifecycleNotifier() OVERRIDE; - virtual void frameDestroyed() OVERRIDE; virtual void willDetachPage() OVERRIDE; |