Changeset 181634 in webkit

Timestamp:

Mar 17, 2015, 4:43:12 AM (11 years ago)

Author:

Carlos Garcia Campos

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.

Location:

releases/WebKitGTK/webkit-2.8/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/icon/IconController.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-16  Brady Eidson  <beidson@apple.com>
+
+        Addressing additional review feedback after http://trac.webkit.org/changeset/181565
+        https://bugs.webkit.org/show_bug.cgi?id=142604
+
+        Reviewed by Darin Adler.
+
+        * loader/icon/IconController.cpp:
+        (WebCore::IconController::startLoader): Null check page()
+
+2015-03-16  Brady Eidson  <beidson@apple.com>
+
+        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  Max Stepin  <maxstepin@gmail.com>
 

releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/icon/IconController.cpp

@@ -161 +161 @@
 
     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()->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.
@@ -203 +207 @@
 {
     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) {