diff options
| author | Iain Merrick <husky@google.com> | 2010-08-19 17:55:56 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-08-23 11:05:40 +0100 |
| commit | f486d19d62f1bc33246748b14b14a9dfa617b57f (patch) | |
| tree | 195485454c93125455a30e553a73981c3816144d /WebCore/page/Page.cpp | |
| parent | 6ba0b43722d16bc295606bec39f396f596e4fef1 (diff) | |
| download | external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.zip external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.gz external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.bz2 | |
Merge WebKit at r65615 : Initial merge by git.
Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
Diffstat (limited to 'WebCore/page/Page.cpp')
| -rw-r--r-- | WebCore/page/Page.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp index f808928..63decd7 100644 --- a/WebCore/page/Page.cpp +++ b/WebCore/page/Page.cpp @@ -65,12 +65,12 @@ #include "SharedBuffer.h" #include "SpeechInput.h" #include "SpeechInputClient.h" -#include "StringHash.h" #include "TextResourceDecoder.h" #include "Widget.h" #include <wtf/HashMap.h> #include <wtf/RefCountedLeakCounter.h> #include <wtf/StdLibExtras.h> +#include <wtf/text/StringHash.h> #if ENABLE(DOM_STORAGE) #include "StorageArea.h" @@ -359,6 +359,9 @@ void Page::goBackOrForward(int distance) void Page::goToItem(HistoryItem* item, FrameLoadType type) { + if (defersLoading()) + return; + // Abort any current load unless we're navigating the current document to a new state object HistoryItem* currentItem = m_mainFrame->loader()->history()->currentItem(); if (!item->stateObject() || !currentItem || item->documentSequenceNumber() != currentItem->documentSequenceNumber() || item == currentItem) { @@ -445,7 +448,10 @@ void Page::refreshPlugins(bool reload) Page* page = *it; // Clear out the page's plug-in data. - page->m_pluginData = 0; + if (page->m_pluginData) { + page->m_pluginData->disconnectPage(); + page->m_pluginData = 0; + } if (!reload) continue; |