diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
| commit | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (patch) | |
| tree | 87f4fd2c7b38db320079a5de8877890d2ca3c485 /Source/WebCore/page/DOMWindowExtension.h | |
| parent | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (diff) | |
| download | qtwebkit-1b914638db989aaa98631a1c1e02c7b2d44805d8.tar.gz | |
Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)
New snapshot to include QDeclarative* -> QQml* build fixes
Diffstat (limited to 'Source/WebCore/page/DOMWindowExtension.h')
| -rw-r--r-- | Source/WebCore/page/DOMWindowExtension.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Source/WebCore/page/DOMWindowExtension.h b/Source/WebCore/page/DOMWindowExtension.h index c20a4f746..53b873cce 100644 --- a/Source/WebCore/page/DOMWindowExtension.h +++ b/Source/WebCore/page/DOMWindowExtension.h @@ -33,7 +33,6 @@ namespace WebCore { -class DOMWindow; class DOMWindowExtension; class DOMWrapperWorld; class Frame; @@ -45,11 +44,11 @@ public: return adoptRef(new DOMWindowExtension(frame, world)); } - ~DOMWindowExtension(); - - virtual void disconnectFrame() OVERRIDE; - virtual void reconnectFrame(Frame*) OVERRIDE; - virtual void willDetachPage() OVERRIDE; + virtual void disconnectFrameForPageCache() OVERRIDE; + virtual void reconnectFrameFromPageCache(Frame*) OVERRIDE; + virtual void willDestroyGlobalObjectInCachedFrame() OVERRIDE; + virtual void willDestroyGlobalObjectInFrame() OVERRIDE; + virtual void willDetachGlobalObjectFromFrame() OVERRIDE; DOMWrapperWorld* world() const { return m_world.get(); } @@ -58,7 +57,6 @@ private: RefPtr<DOMWrapperWorld> m_world; RefPtr<Frame> m_disconnectedFrame; - DOMWindow* m_disconnectedDOMWindow; bool m_wasDetached; }; |