Changeset 16440 in webkit

Timestamp:

Sep 18, 2006 7:21:52 PM (18 years ago)

Author:

beidson

Message:

WebCore:

Reviewed by Anders

<rdar://problem/3028061> - WebKit never updates favicon
The WebKit enforced expiration date for icons has worked for some time, but the
move to the new Icon Loader broke the "always get the icon if the user refreshes the page"
functionality. This patch fixes that up, along with some other architectural improvements,
the main one being that WebCore::Document now contains an iconURL for the Frame to query if needed.

• bridge/mac/FrameMac.h: Added isLoadTypeReload()
• bridge/mac/FrameMac.mm: (WebCore::FrameMac::isLoadTypeReload): Implementation, calls into the bridge
• bridge/mac/WebCoreFrameBridge.h: Added isLoadTypeReload:
• bridge/win/FrameWin.h: Added isLoadTypeReload() for temporary link stub
• dom/Document.h: Added m_iconURL (WebCore::Document::iconURL): Added (WebCore::Document::setIconURL): Ditto
• html/HTMLLinkElement.cpp: (WebCore::HTMLLinkElement::process): Sets the iconURL in the Document instead of the Frame
• page/Frame.cpp: (WebCore::Frame::iconURL): Calculates the iconURL based on the document, then the default favicon.ico url (WebCore::Frame::endIfNotLoading): Checks for the load type - always loads icon on Reload
• page/Frame.h: Nuked setIconURL(), added isLoadTypeReload()
• page/FramePrivate.h: Nuked IconURL
• platform/win/TemporaryLinkStubs.cpp: (FrameWin::isLoadTypeReload):

WebKit:

Reviewed by Anders

Implement a bridge method so WebCore can find the reload type of a frame load

• WebCoreSupport/WebFrameBridge.m: (-[WebFrameBridge isLoadTypeReload]):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bridge/mac/FrameMac.h (modified) (1 diff)
• WebCore/bridge/mac/FrameMac.mm (modified) (1 diff)
• WebCore/bridge/mac/WebCoreFrameBridge.h (modified) (1 diff)
• WebCore/bridge/win/FrameWin.h (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (1 diff)
• WebCore/dom/Document.h (modified) (3 diffs)
• WebCore/html/HTMLDocument.cpp (modified) (1 diff)
• WebCore/html/HTMLDocument.h (modified) (1 diff)
• WebCore/html/HTMLLinkElement.cpp (modified) (1 diff)
• WebCore/page/Frame.cpp (modified) (3 diffs)
• WebCore/page/Frame.h (modified) (2 diffs)
• WebCore/page/FramePrivate.h (modified) (1 diff)
• WebCore/platform/win/TemporaryLinkStubs.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebCoreSupport/WebFrameBridge.m (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-09-18  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Anders
+
+        <rdar://problem/3028061> - WebKit never updates favicon
+        The WebKit enforced expiration date for icons has worked for some time, but the
+        move to the new Icon Loader broke the "always get the icon if the user refreshes the page" 
+        functionality.  This patch fixes that up, along with some other architectural improvements,
+        the main one being that WebCore::Document now contains an iconURL for the Frame to query if needed.
+
+        * bridge/mac/FrameMac.h: Added isLoadTypeReload()
+        * bridge/mac/FrameMac.mm:
+        (WebCore::FrameMac::isLoadTypeReload): Implementation, calls into the bridge
+        * bridge/mac/WebCoreFrameBridge.h: Added isLoadTypeReload:
+        * bridge/win/FrameWin.h: Added isLoadTypeReload() for temporary link stub
+        * dom/Document.h: Added m_iconURL
+        (WebCore::Document::iconURL): Added
+        (WebCore::Document::setIconURL): Ditto
+        * html/HTMLLinkElement.cpp:
+        (WebCore::HTMLLinkElement::process): Sets the iconURL in the Document instead of the Frame
+        * page/Frame.cpp:
+        (WebCore::Frame::iconURL): Calculates the iconURL based on the document, then the default favicon.ico url
+        (WebCore::Frame::endIfNotLoading): Checks for the load type - always loads icon on Reload
+        * page/Frame.h: Nuked setIconURL(), added isLoadTypeReload()
+        * page/FramePrivate.h: Nuked IconURL
+        * platform/win/TemporaryLinkStubs.cpp:
+        (FrameWin::isLoadTypeReload):
+
 2006-09-18  Sam Weinig  <sam.weinig@gmail.com>
 

trunk/WebCore/bridge/mac/FrameMac.h

@@ -325 +325 @@
     virtual void stopRedirectionTimer();
     virtual void cleanupPluginObjects();
+    virtual bool isLoadTypeReload();
     
 private:

trunk/WebCore/bridge/mac/FrameMac.mm

@@ -3571 +3571 @@
 }
 
-}
+bool FrameMac::isLoadTypeReload()
+{
+    return [_bridge isLoadTypeReload];
+}
+
+}

trunk/WebCore/bridge/mac/WebCoreFrameBridge.h

@@ -689 +689 @@
 - (void)notifyIconChanged:(NSURL*)iconURL;
 - (NSURL*)originalRequestURL;
+- (BOOL)isLoadTypeReload;
 @end
 

trunk/WebCore/bridge/win/FrameWin.h

@@ -127 +127 @@
     bool keyPress(const PlatformKeyboardEvent&);
     virtual KURL originalRequestURL() const;
+    
+protected:
+    virtual bool isLoadTypeReload();
 
 private:

trunk/WebCore/dom/Document.cpp

@@ -3482 +3482 @@
 }
 
-}
+
+String Document::iconURL()
+{
+    return m_iconURL;
+}
+
+void Document::setIconURL(const String& iconURL, const String& type)
+{
+    // FIXME - <rdar://problem/4727645> - At some point in the future, we might actually honor the "type" 
+    if (m_iconURL.isEmpty())
+        m_iconURL = iconURL;
+    else if (!type.isEmpty())
+        m_iconURL = iconURL;
+}
+
+}

trunk/WebCore/dom/Document.h

@@ -599 +599 @@
     bool didLayoutWithPendingStylesheets() const { return m_pendingSheetLayout == DidLayoutWithPendingSheets; }
 
+    String iconURL();
+    void setIconURL(const String& iconURL, const String& type);
 protected:
     CSSStyleSelector* m_styleSelector;
@@ -608 +610 @@
     DeprecatedString m_baseURL;
     String m_baseTarget;
-
+    
     RefPtr<DocumentType> m_docType;
     RefPtr<DOMImplementation> m_implementation;
@@ -813 +815 @@
     bool m_createRenderers;
     bool m_inPageCache;
+    String m_iconURL;
 };
 

trunk/WebCore/html/HTMLDocument.cpp

@@ -423 +423 @@
  
 }
-
-}
+    
+}

trunk/WebCore/html/HTMLDocument.h

@@ -66 +66 @@
 
     typedef HashMap<StringImpl*, int> NameCountMap;
-
+    
 protected:
     HTMLElement* bodyElement;

trunk/WebCore/html/HTMLLinkElement.cpp

@@ -153 +153 @@
 
     String type = m_type.lower();
-    
-    Frame* frame = document()->frame();
 
     // IE extension: location of small icon for locationbar / bookmarks
-    if (frame && m_isIcon && !m_url.isEmpty() && !frame->tree()->parent())
-        frame->setIconURL(m_url, type);
+    // We'll record this URL per document, even if we later only use it in top level frames
+    if (m_isIcon && !m_url.isEmpty())
+        document()->setIconURL(m_url, type);
 
     // Stylesheet

trunk/WebCore/page/Frame.cpp

@@ -232 +232 @@
         
     // If we have an iconURL from a Link element, return that
-    if (!d->m_iconURL.isEmpty())
-        return KURL(d->m_iconURL.deprecatedString());
+    if (!document()->iconURL().isEmpty())
+        return KURL(document()->iconURL().deprecatedString());
         
     // Don't return a favicon iconURL unless we're http or https
@@ -244 +244 @@
     url.setPath("/favicon.ico");
     return url;
-}
-
-void Frame::setIconURL(const String& url, const String& type)
-{
-    // FIXME - <rdar://problem/4727645> - At some point in the future, we might actually honor the "type" 
-    if (d->m_iconURL.isEmpty())
-        d->m_iconURL = url;
-    else if (!type.isEmpty())
-        d->m_iconURL = url;
 }
 
@@ -783 +774 @@
     IconDatabase* sharedIconDatabase = IconDatabase::sharedIconDatabase();
     // If we already have an unexpired icon, we won't kick off a load but we *will* map the appropriate URLs to it
-    if (sharedIconDatabase->hasEntryForIconURL(url) && !sharedIconDatabase->isIconExpiredForIconURL(url)) {
+    if (sharedIconDatabase->hasEntryForIconURL(url) && !isLoadTypeReload() && !sharedIconDatabase->isIconExpiredForIconURL(url)) {
         commitIconURLToIconDatabase();
         return;

trunk/WebCore/page/Frame.h

@@ -108 +108 @@
 
   KURL iconURL();
-  void setIconURL(const String& url, const String& type);
   void commitIconURLToIconDatabase();
   
@@ -591 +590 @@
 
   virtual void redirectionTimerFired(Timer<Frame>*);
+  
+  virtual bool isLoadTypeReload() = 0;
 
 public:

trunk/WebCore/page/FramePrivate.h

@@ -174 +174 @@
         String m_referrer;
 
-        String m_iconURL;
-
         struct SubmitForm {
             const char* submitAction;

trunk/WebCore/platform/win/TemporaryLinkStubs.cpp

@@ -183 +183 @@
 void FrameWin::issuePasteAndMatchStyleCommand() { notImplemented(); }
 KURL FrameWin::originalRequestURL() const { return KURL(); }
+bool FrameWin::isLoadTypeReload() { notImplemented(); return false; }
 
 bool BrowserExtensionWin::canRunModal() { notImplemented(); return 0; }

trunk/WebKit/ChangeLog

@@ +1 @@
+2006-09-18  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Anders
+
+        Implement a bridge method so WebCore can find the reload type of a frame load
+
+        * WebCoreSupport/WebFrameBridge.m:
+        (-[WebFrameBridge isLoadTypeReload]):
+
 2006-09-18  Sam Weinig  <sam.weinig@gmail.com>
 

trunk/WebKit/WebCoreSupport/WebFrameBridge.m

@@ -1714 +1714 @@
 }
 
+- (BOOL)isLoadTypeReload
+{
+    return [_frame _loadType] == WebFrameLoadTypeReload;
+}
+
+
+
 @end