[mingw-qt5-qtwebkit] Fix URLs visited during private browsing showing up in WebpageIcons.db (RHBZ #1204798 #1204799)

[Erik van Pienbroek]

commit b1130ccbd76f581f5ff75db31af1d070e15cac63
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Mar 23 19:33:02 2015 +0100

    Fix URLs visited during private browsing showing up in WebpageIcons.db (RHBZ #1204798 #1204799)

 ...sited-during-private-browsing-showing-up-.patch | 50 ++++++++++++++++++++++
 mingw-qt5-qtwebkit.spec                            |  7 +++
 2 files changed, 57 insertions(+)
---
diff --git a/0001-Fix-URLs-visited-during-private-browsing-showing-up-.patch b/0001-Fix-URLs-visited-during-private-browsing-showing-up-.patch
new file mode 100644
index 0000000..0bfb55a
--- /dev/null
+++ b/0001-Fix-URLs-visited-during-private-browsing-showing-up-.patch
@@ -0,0 +1,50 @@
+From 2810aea1f6c9cca48b93130a7c245f9a2f85637e Mon Sep 17 00:00:00 2001
+From: Florian Bruhin <git at the-compiler.org>
+Date: Wed, 18 Mar 2015 18:47:19 +0100
+Subject: [PATCH] Fix URLs visited during private browsing showing up in
+ WebpageIcons.db.
+
+Ported from http://trac.webkit.org/changeset/181565 by beidson at 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 at theqtcompany.com>
+---
+ Source/WebCore/loader/icon/IconController.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Source/WebCore/loader/icon/IconController.cpp b/Source/WebCore/loader/icon/IconController.cpp
+index 8f23f6d..a808352 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());
+-- 
+2.3.3
+
diff --git a/mingw-qt5-qtwebkit.spec b/mingw-qt5-qtwebkit.spec
index 9505412..ec66746 100644
--- a/mingw-qt5-qtwebkit.spec
+++ b/mingw-qt5-qtwebkit.spec
@@ -83,6 +83,11 @@ BuildRequires:  perl perl(version) perl(Digest::MD5) perl(Text::ParseWords)
 # The ICU libraries used for cross-compilation are named exactly the same as their native Linux counterpart
 Patch0:         qt5-qtwebkit-use-correct-icu-libs.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1204798
+# https://bugzilla.redhat.com/show_bug.cgi?id=1204799
+# https://codereview.qt-project.org/#/c/108936/
+Patch1:         0001-Fix-URLs-visited-during-private-browsing-showing-up-.patch
+
 # By default the build system assumes that pkg-config isn't used for the win32 target
 # However, we're using it in the Fedora MinGW toolchain so make sure it is used automatically
 Patch2:         qt5-qtwebkit-enable-pkgconfig-support-for-win32-target.patch
@@ -162,6 +167,7 @@ Fedora Windows cross-compiler.
 %prep
 %setup -q -n %{source_folder}
 %patch0 -p1 -b .icu
+%patch1 -p1 -b .bug1204798
 %patch2 -p0 -b .pkgconfig
 %patch3 -p1 -b .angle
 %patch4 -p1 -b .no_icu
@@ -242,6 +248,7 @@ mv $RPM_BUILD_ROOT%{mingw64_datadir}/qt5/bin/QtWebProcess.exe $RPM_BUILD_ROOT%{m
 %changelog
 * Sun Mar 22 2015 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4.1-1
 - Update to 5.4.1
+- Fix URLs visited during private browsing showing up in WebpageIcons.db (RHBZ #1204798 #1204799)
 
 * Mon Dec 29 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4.0-1
 - Update to 5.4.0