Title: [181565] trunk/Source/WebCore
- Revision
- 181565
- Author
- [email protected]
- Date
- 2015-03-16 10:52:30 -0700 (Mon, 16 Mar 2015)
Log Message
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: trunk/Source/WebCore/ChangeLog (181564 => 181565)
--- trunk/Source/WebCore/ChangeLog 2015-03-16 17:42:31 UTC (rev 181564)
+++ trunk/Source/WebCore/ChangeLog 2015-03-16 17:52:30 UTC (rev 181565)
@@ -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-16 Conrad Shultz <[email protected]>
Allow clients to selectively disable plug-ins
Modified: trunk/Source/WebCore/loader/icon/IconController.cpp (181564 => 181565)
--- trunk/Source/WebCore/loader/icon/IconController.cpp 2015-03-16 17:42:31 UTC (rev 181564)
+++ trunk/Source/WebCore/loader/icon/IconController.cpp 2015-03-16 17:52:30 UTC (rev 181565)
@@ -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()->usesEphemeralSession())
+ 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()->usesEphemeralSession())
- 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
