[SCM] qt5webkit packaging branch, master, updated. debian/5.3.2+dfsg-4

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt5webkit.git;a=commitdiff;h=58737b3

The following commit has been merged in the master branch:
commit 58737b30ef4eeecd19737b92e3ce8d8194048c23
Author: Felix Geyer <fgeyer at debian.org>
Date:   Wed Apr 1 19:44:17 2015 +0200

    Backport webpageicons_db_privacy.patch from upstream.
---
 debian/changelog                             |  5 +++
 debian/patches/series                        |  1 +
 debian/patches/webpageicons_db_privacy.patch | 47 ++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 333b0ec..2ad4731 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ qtwebkit-opensource-src (5.3.2+dfsg-4) UNRELEASED; urgency=medium
   * Backport upstream fix that adds missing checks for HTMLUnknownElement.
     Closes: #781194.
 
+  [ Felix Geyer ]
+  * Backport upstream fix that prevents recording visited URLs to its favicon
+    database while using private browsing mode.
+    Closes: #780748.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 01 Apr 2015 11:51:03 +0300
 
 qtwebkit-opensource-src (5.3.2+dfsg-3) unstable; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index 63288fb..5fb94f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@ do_not_use_jit_on_big_endian_machines.patch
 fix_cloop_on_big_endian_machines.patch
 fix_crash_when_a_network_request_is_aborted_while_forwarding_data.patch
 blacklist_libkpartsplugin.patch
+webpageicons_db_privacy.patch
 
 # debian patches
 reduce_memory_usage.patch
diff --git a/debian/patches/webpageicons_db_privacy.patch b/debian/patches/webpageicons_db_privacy.patch
new file mode 100644
index 0000000..bda2bc3
--- /dev/null
+++ b/debian/patches/webpageicons_db_privacy.patch
@@ -0,0 +1,47 @@
+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: 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());

-- 
qt5webkit packaging