diff options
Diffstat (limited to 'Source/WebCore/page/DOMWindow.cpp')
| -rw-r--r-- | Source/WebCore/page/DOMWindow.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp index 52107c887..c4651d744 100644 --- a/Source/WebCore/page/DOMWindow.cpp +++ b/Source/WebCore/page/DOMWindow.cpp @@ -735,8 +735,6 @@ Storage* DOMWindow::sessionStorage(ExceptionCode& ec) const { if (!isCurrentlyDisplayedInFrame()) return 0; - if (m_sessionStorage) - return m_sessionStorage.get(); Document* document = this->document(); if (!document) @@ -747,6 +745,9 @@ Storage* DOMWindow::sessionStorage(ExceptionCode& ec) const return 0; } + if (m_sessionStorage) + return m_sessionStorage.get(); + Page* page = document->page(); if (!page) return 0; @@ -762,8 +763,6 @@ Storage* DOMWindow::localStorage(ExceptionCode& ec) const { if (!isCurrentlyDisplayedInFrame()) return 0; - if (m_localStorage) - return m_localStorage.get(); Document* document = this->document(); if (!document) @@ -774,6 +773,9 @@ Storage* DOMWindow::localStorage(ExceptionCode& ec) const return 0; } + if (m_localStorage) + return m_localStorage.get(); + Page* page = document->page(); if (!page) return 0; |