diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-06-01 15:54:01 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-06-02 14:07:43 +0000 |
| commit | 0a3506ebe5d7f431f0dd4dffa24ac32063b90ff1 (patch) | |
| tree | f3d0b92fe7bc5b31426a838c354616fff335e82b /Source/WebCore/page/Frame.cpp | |
| parent | 881da28418d380042aa95a97f0cbd42560a64f7c (diff) | |
| download | qtwebkit-0a3506ebe5d7f431f0dd4dffa24ac32063b90ff1.tar.gz | |
Import WebKit commit 3ca7a25a550e473d60bbbe321475c6c0ef114b31
Change-Id: I480668a0cb8114dccf7a1195190a993282875759
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'Source/WebCore/page/Frame.cpp')
| -rw-r--r-- | Source/WebCore/page/Frame.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp index b1b84a462..9315237af 100644 --- a/Source/WebCore/page/Frame.cpp +++ b/Source/WebCore/page/Frame.cpp @@ -245,7 +245,7 @@ void Frame::setView(RefPtr<FrameView>&& view) // Prepare for destruction now, so any unload event handlers get run and the DOMWindow is // notified. If we wait until the view is destroyed, then things won't be hooked up enough for // these calls to work. - if (!view && m_doc && !m_doc->inPageCache()) + if (!view && m_doc && m_doc->pageCacheState() != Document::InPageCache) m_doc->prepareForDestruction(); if (m_view) @@ -267,7 +267,7 @@ void Frame::setDocument(RefPtr<Document>&& newDocument) { ASSERT(!newDocument || newDocument->frame() == this); - if (m_doc && !m_doc->inPageCache()) + if (m_doc && m_doc->pageCacheState() != Document::InPageCache) m_doc->prepareForDestruction(); m_doc = newDocument.copyRef(); |