Changeset 17626 in webkit

Timestamp:

Nov 6, 2006 1:03:30 PM (17 years ago)

Author:

beidson

Message:

Reviewed by Oliver

Fixes <rdar://problem/4812674> and ​http://bugs.webkit.org/show_bug.cgi?id=11530
For now, we have to not load favicons when we have no Document - linking directly
to PDFs being the common case

• loader/icon/IconLoader.cpp: (WebCore::IconLoader::startLoading): Check for the document and return if none

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/icon/IconLoader.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-11-06  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Oliver
+
+        Fixes <rdar://problem/4812674> and http://bugs.webkit.org/show_bug.cgi?id=11530
+        For now, we have to not load favicons when we have no Document - linking directly 
+        to PDFs being the common case
+
+        * loader/icon/IconLoader.cpp:
+        (WebCore::IconLoader::startLoading): Check for the document and return if none
+
 2006-11-06  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/loader/icon/IconLoader.cpp

@@ -63 +63 @@
     m_httpStatusCode = 0;
     
-    // A frame may be documentless - one example is viewing a PDF directly
+    // FIXME - http://bugs.webkit.org/show_bug.cgi?id=10902
+    // Once the loader infrastructure will cleanly let us load an icon without a DocLoader, we can implement this
+    // A frame may be documentless - one example is viewing a PDF directly.  Until the above FIXME is resolved,
+    // we must bail out early when we have no document
     if (!m_frame->document()) {
-        // FIXME - http://bugzilla.opendarwin.org/show_bug.cgi?id=10902
-        // Once the loader infrastructure will cleanly let us load an icon without a DocLoader, we can implement this
         LOG(IconDatabase, "Documentless-frame - icon won't be loaded");
+        return;
     }