QtWebKit logs visited URLs to WebpageIcons.db in private browsing mode (#1204795)
This commit is contained in:
parent
20d5a63454
commit
040a65edcf
|
@ -5,7 +5,7 @@ Name: qtwebkit
|
||||||
Summary: Qt WebKit bindings
|
Summary: Qt WebKit bindings
|
||||||
|
|
||||||
Version: 2.3.4
|
Version: 2.3.4
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
|
|
||||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||||
URL: http://trac.webkit.org/wiki/QtWebKit
|
URL: http://trac.webkit.org/wiki/QtWebKit
|
||||||
|
@ -55,6 +55,8 @@ Patch14: webkit-qtwebkit-23-no_rpath.patch
|
||||||
# qtwebkit: undefined symbol: g_type_class_adjust_private_offset
|
# qtwebkit: undefined symbol: g_type_class_adjust_private_offset
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1202735
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1202735
|
||||||
Patch100: webkit-qtwebkit-23-gcc5.patch
|
Patch100: webkit-qtwebkit-23-gcc5.patch
|
||||||
|
# backport from qt5-qtwebkit: URLs visited during private browsing show up in WebpageIcons.db
|
||||||
|
Patch101: webkit-qtwebkit-23-private_browsing.patch
|
||||||
|
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
|
@ -133,6 +135,7 @@ Provides: qt4-webkit-devel%{?_isa} = 2:%{version}-%{release}
|
||||||
%patch14 -p1 -b .no_rpath
|
%patch14 -p1 -b .no_rpath
|
||||||
|
|
||||||
%patch100 -p1 -b .gcc5
|
%patch100 -p1 -b .gcc5
|
||||||
|
%patch101 -p1 -b .private_browsing
|
||||||
|
|
||||||
install -m755 -D %{SOURCE1} bin/qmake
|
install -m755 -D %{SOURCE1} bin/qmake
|
||||||
|
|
||||||
|
@ -218,6 +221,9 @@ popd
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 23 2015 Rex Dieter <rdieter@fedoraproject.org> 2.3.4-6
|
||||||
|
- QtWebKit logs visited URLs to WebpageIcons.db in private browsing mode (#1204795)
|
||||||
|
|
||||||
* Mon Mar 23 2015 Rex Dieter <rdieter@fedoraproject.org> 2.3.4-5
|
* Mon Mar 23 2015 Rex Dieter <rdieter@fedoraproject.org> 2.3.4-5
|
||||||
- drop ppc64le patch (that no longer applies or is needed)
|
- drop ppc64le patch (that no longer applies or is needed)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
diff -up webkit-qtwebkit-23/Source/WebCore/loader/icon/IconController.cpp.private_browsing webkit-qtwebkit-23/Source/WebCore/loader/icon/IconController.cpp
|
||||||
|
--- webkit-qtwebkit-23/Source/WebCore/loader/icon/IconController.cpp.private_browsing 2014-09-24 06:42:05.000000000 -0500
|
||||||
|
+++ webkit-qtwebkit-23/Source/WebCore/loader/icon/IconController.cpp 2015-03-23 11:20:04.050447318 -0500
|
||||||
|
@@ -163,6 +163,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 (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);
|
||||||
|
@@ -206,10 +210,6 @@ void IconController::continueLoadWithDec
|
||||||
|
{
|
||||||
|
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());
|
Loading…
Reference in New Issue