diff options
author | Florian Bruhin <git@the-compiler.org> | 2015-03-18 18:47:19 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-18 22:54:40 +0000 |
commit | 2810aea1f6c9cca48b93130a7c245f9a2f85637e (patch) | |
tree | c59d7eb651a554b3e5da524767c9b0f02d66b95e | |
parent | 8974c50559e04665ce7771aa097ad83fb59a89d8 (diff) | |
download | qtwebkit-2810aea1f6c9cca48b93130a7c245f9a2f85637e.tar.gz |
Fix URLs visited during private browsing showing up in WebpageIcons.db.
Ported from http://trac.webkit.org/changeset/181565 by beidson@apple.com.
Upstream patch by Sam Weinig, reviewed by Brady Eidson.
* loader/icon/IconController.cpp:
(WebCore::IconController::startLoader): Bail early here if the page is using an ephemeral session.
(WebCore::IconController::continueLoadWithDecision): Instead of here.
Change-Id: I263bb6122606caa3488d641b127dd377012ee424
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-rw-r--r-- | Source/WebCore/loader/icon/IconController.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/loader/icon/IconController.cpp b/Source/WebCore/loader/icon/IconController.cpp index 8f23f6db1..a808352af 100644 --- a/Source/WebCore/loader/icon/IconController.cpp +++ b/Source/WebCore/loader/icon/IconController.cpp @@ -159,6 +159,10 @@ void IconController::startLoader() } if (iconDatabase().supportsAsynchronousMode()) { + // FIXME (<rdar://problem/9168605>) - We should support in-memory-only private browsing icons in asynchronous icon database mode. + if (iconDatabase().supportsAsynchronousMode() && m_frame->page()->settings()->privateBrowsingEnabled()) + return; + m_frame->loader()->documentLoader()->getIconLoadDecisionForIconURL(urlString); // Commit the icon url mapping to the database just in case we don't end up loading later. commitToDatabase(iconURL); @@ -202,10 +206,6 @@ void IconController::continueLoadWithDecision(IconLoadDecision iconLoadDecision) { ASSERT(iconLoadDecision != IconLoadUnknown); - // FIXME (<rdar://problem/9168605>) - We should support in-memory-only private browsing icons in asynchronous icon database mode. - if (iconDatabase().supportsAsynchronousMode() && m_frame->page()->settings()->privateBrowsingEnabled()) - return; - if (iconLoadDecision == IconLoadNo) { KURL iconURL(url()); String urlString(iconURL.string()); |