26 lines
1.5 KiB
Diff
26 lines
1.5 KiB
Diff
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());
|