diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-21 14:09:57 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 15:14:36 +0100 |
| commit | eb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch) | |
| tree | 2c7c940e1dbee81b89d935626110816b494aa32c /chromium/third_party/WebKit/Source/core/loader/DocumentLoader.cpp | |
| parent | 9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff) | |
| download | qtwebengine-chromium-eb32ba6f51d0c21d58cd7d89785285ff8fa64624.tar.gz | |
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/loader/DocumentLoader.cpp')
| -rw-r--r-- | chromium/third_party/WebKit/Source/core/loader/DocumentLoader.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/chromium/third_party/WebKit/Source/core/loader/DocumentLoader.cpp b/chromium/third_party/WebKit/Source/core/loader/DocumentLoader.cpp index 73f7c6e4040..bb5a31827b3 100644 --- a/chromium/third_party/WebKit/Source/core/loader/DocumentLoader.cpp +++ b/chromium/third_party/WebKit/Source/core/loader/DocumentLoader.cpp @@ -36,20 +36,20 @@ #include "core/dom/Document.h" #include "core/dom/DocumentParser.h" #include "core/dom/Event.h" -#include "core/fetch/MemoryCache.h" -#include "core/fetch/ResourceFetcher.h" -#include "core/fetch/ResourceLoader.h" #include "core/html/HTMLFrameOwnerElement.h" #include "core/inspector/InspectorInstrumentation.h" #include "core/loader/DocumentWriter.h" #include "core/loader/FrameLoader.h" #include "core/loader/FrameLoaderClient.h" +#include "core/loader/ResourceLoader.h" #include "core/loader/SinkDocument.h" #include "core/loader/TextResourceDecoder.h" #include "core/loader/UniqueIdentifier.h" #include "core/loader/appcache/ApplicationCacheHost.h" #include "core/loader/archive/ArchiveResourceCollection.h" #include "core/loader/archive/MHTMLArchive.h" +#include "core/loader/cache/MemoryCache.h" +#include "core/loader/cache/ResourceFetcher.h" #include "core/page/DOMWindow.h" #include "core/page/Frame.h" #include "core/page/FrameTree.h" @@ -240,7 +240,7 @@ void DocumentLoader::stopLoading() Document* doc = m_frame->document(); if (loading || doc->parsing()) - m_frame->loader()->stopLoading(); + m_frame->loader()->stopLoading(UnloadEventPolicyNone); } // Always cancel multipart loaders @@ -807,6 +807,15 @@ bool DocumentLoader::scheduleArchiveLoad(Resource* cachedResource, const Resourc return true; } +void DocumentLoader::setTitle(const StringWithDirection& title) +{ + if (m_pageTitle == title) + return; + + m_pageTitle = title; + frameLoader()->didChangeTitle(this); +} + KURL DocumentLoader::urlForHistory() const { // Return the URL to be used for history and B/F list. |