diff options
| author | Ben Murdoch <benm@google.com> | 2009-06-05 14:49:32 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-06-05 15:24:00 +0100 |
| commit | e1503159a6023b8eb39fbecadf6986c8ddd862e2 (patch) | |
| tree | 2475b9c31532b452d5449c5372138ffa59675b0c /WebCore/loader/DocumentLoader.cpp | |
| parent | bf22f208d6fb755dd4ddebbde1a1a3b23e597990 (diff) | |
| download | external_webkit-e1503159a6023b8eb39fbecadf6986c8ddd862e2.zip external_webkit-e1503159a6023b8eb39fbecadf6986c8ddd862e2.tar.gz external_webkit-e1503159a6023b8eb39fbecadf6986c8ddd862e2.tar.bz2 | |
Check in patch for webkit bug 25710. History navigation by fragement breaks database transactions.
https://bugs.webkit.org/show_bug.cgi?id=25710, landed to webkit in r44468
Diffstat (limited to 'WebCore/loader/DocumentLoader.cpp')
| -rw-r--r-- | WebCore/loader/DocumentLoader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/loader/DocumentLoader.cpp b/WebCore/loader/DocumentLoader.cpp index bdf83a8..d0443e8 100644 --- a/WebCore/loader/DocumentLoader.cpp +++ b/WebCore/loader/DocumentLoader.cpp @@ -283,7 +283,7 @@ void DocumentLoader::mainReceivedError(const ResourceError& error, bool isComple // one document at a time, but one document may have many related resources. // stopLoading will stop all loads initiated by the data source, // but not loads initiated by child frames' data sources -- that's the WebFrame's job. -void DocumentLoader::stopLoading() +void DocumentLoader::stopLoading(DatabasePolicy databasePolicy) { // In some rare cases, calling FrameLoader::stopLoading could set m_loading to false. // (This can happen when there's a single XMLHttpRequest currently loading and stopLoading causes it @@ -296,7 +296,7 @@ void DocumentLoader::stopLoading() Document* doc = m_frame->document(); if (loading || doc->parsing()) - m_frame->loader()->stopLoading(false); + m_frame->loader()->stopLoading(false, databasePolicy); } // Always cancel multipart loaders |