rpms/qt5-qtwebkit
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into f22

Browse Source
This commit is contained in:
Rex Dieter 2015-03-23 11:38:00 -05:00
commit dd1c688b60
3 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
qt5-qtwebkit-gcc5-patch → qt5-qtwebkit-gcc5.patch
View File

12
qt5-qtwebkit.spec
View File

@ -13,7 +13,7 @@
Summary: Qt5 - QtWebKit components Summary: Qt5 - QtWebKit components
Name: qt5-qtwebkit Name: qt5-qtwebkit
Version: 5.4.1 Version: 5.4.1
Release: 3%{?dist} Release: 4%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
# See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@ -52,7 +52,11 @@ Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch
Patch9: qtwebkit-opensource-src-5.4.0-mutexlocker.patch Patch9: qtwebkit-opensource-src-5.4.0-mutexlocker.patch
# fix gcc5 template issue # fix gcc5 template issue
Patch10: qt5-qtwebkit-gcc5-patch Patch10: qt5-qtwebkit-gcc5.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1204795
# https://codereview.qt-project.org/#/c/108936/
Patch11: qtwebkit-opensource-src-5.4.1-private_browsing.patch
%if 0%{?system_angle} %if 0%{?system_angle}
BuildRequires: angleproject-devel angleproject-static BuildRequires: angleproject-devel angleproject-static
@ -132,6 +136,7 @@ BuildArch: noarch
%patch8 -p1 -b .no_rpath %patch8 -p1 -b .no_rpath
%patch9 -p1 -b .MutexLocker %patch9 -p1 -b .MutexLocker
%patch10 -p1 -b .gcc5-template %patch10 -p1 -b .gcc5-template
%patch11 -p1 -b .private_browsing
echo "nuke bundled code..." echo "nuke bundled code..."
# nuke bundled code # nuke bundled code
@ -213,6 +218,9 @@ popd
%changelog %changelog
* Mon Mar 23 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-4
- QtWebKit logs visited URLs to WebpageIcons.db in private browsing mode (#1204795,#1204798)
* Wed Mar 18 2015 Than Ngo <than@redhat.com> - 5.4.1-3 * Wed Mar 18 2015 Than Ngo <than@redhat.com> - 5.4.1-3
- fix build failure with new gcc5 - fix build failure with new gcc5

25
qtwebkit-opensource-src-5.4.1-private_browsing.patch Normal file
View File

@ -0,0 +1,25 @@
diff -up qtwebkit-opensource-src-5.4.1/Source/WebCore/loader/icon/IconController.cpp.private_browsing qtwebkit-opensource-src-5.4.1/Source/WebCore/loader/icon/IconController.cpp
--- qtwebkit-opensource-src-5.4.1/Source/WebCore/loader/icon/IconController.cpp.private_browsing 2015-02-16 22:57:04.000000000 -0600
+++ qtwebkit-opensource-src-5.4.1/Source/WebCore/loader/icon/IconController.cpp 2015-03-23 11:29:41.688034891 -0500
@@ -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 (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::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());