diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-23 15:05:51 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-23 15:31:48 +0000 |
commit | 9cb87fa7638e305ef35b04f54ba07ac4fa04adcb (patch) | |
tree | 2793d80883b7daab67258117755046d428f9978c /chromium/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp | |
parent | 98ff39cb35ef2bd32bb1af9565628a4a4b0979b2 (diff) | |
download | qtwebengine-chromium-9cb87fa7638e305ef35b04f54ba07ac4fa04adcb.tar.gz |
BASELINE: Update Chromium to 47.0.2526.71
Also adds a few missing spellcheck sources.
Change-Id: I300864710316ff3cd3ad456dd7a3d048b45f57d5
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp b/chromium/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp index 34bc016e83c..93c697a708a 100644 --- a/chromium/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp +++ b/chromium/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp @@ -453,9 +453,9 @@ WebPageSerializerImpl::WebPageSerializerImpl(WebFrame* frame, bool WebPageSerializerImpl::serialize() { bool didSerialization = false; - KURL mainURL = m_specifiedWebLocalFrameImpl->frame()->document()->url(); WebLocalFrameImpl* webFrame = m_specifiedWebLocalFrameImpl; + bool isMainFrame = webFrame->frame()->isMainFrame(); Document* document = webFrame->frame()->document(); const KURL& url = document->url(); @@ -463,7 +463,7 @@ bool WebPageSerializerImpl::serialize() didSerialization = true; const WTF::TextEncoding& textEncoding = document->encoding().isValid() ? document->encoding() : UTF8Encoding(); - String directoryName = url == mainURL ? m_localDirectoryName : ""; + String directoryName = isMainFrame ? m_localDirectoryName : ""; SerializeDomParam param(url, textEncoding, document, directoryName); |