Title: [197268] releases/WebKitGTK/webkit-2.4/Source/WebCore
- Revision
- 197268
- Author
- [email protected]
- Date
- 2016-02-28 02:01:03 -0800 (Sun, 28 Feb 2016)
Log Message
Merge r181565 - URLs visited during private browsing show up in WebpageIcons.db
rdar://problem/11254910 and https://bugs.webkit.org/show_bug.cgi?id=142733
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.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (197267 => 197268)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2016-02-28 09:51:27 UTC (rev 197267)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2016-02-28 10:01:03 UTC (rev 197268)
@@ -1,3 +1,14 @@
+2015-03-16 Brady Eidson <[email protected]>
+
+ URLs visited during private browsing show up in WebpageIcons.db
+ rdar://problem/11254910 and https://bugs.webkit.org/show_bug.cgi?id=142733
+
+ 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.
+
2015-03-26 Zalan Bujtas <[email protected]>
Inline continuation code should not take anonymous containing wrapper granted.
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/loader/icon/IconController.cpp (197267 => 197268)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/loader/icon/IconController.cpp 2016-02-28 09:51:27 UTC (rev 197267)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/loader/icon/IconController.cpp 2016-02-28 10:01:03 UTC (rev 197268)
@@ -160,6 +160,10 @@
}
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() && 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);
@@ -203,10 +207,6 @@
{
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) {
URL iconURL(url());
String urlString(iconURL.string());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
