webengine/osswebengine/WebCore/html/HTMLLinkElement.cpp
branchRCL_3
changeset 48 79859ed3eea9
parent 27 6297cdf66332
child 49 919f36ff910f
equal deleted inserted replaced
47:e1bea15f9a39 48:79859ed3eea9
    22  * Boston, MA 02110-1301, USA.
    22  * Boston, MA 02110-1301, USA.
    23  */
    23  */
    24 #include "config.h"
    24 #include "config.h"
    25 #include "HTMLLinkElement.h"
    25 #include "HTMLLinkElement.h"
    26 
    26 
    27 #include "CSSHelper.h"
    27 #include "csshelper.h"
    28 #include "CachedCSSStyleSheet.h"
    28 #include "CachedCSSStyleSheet.h"
    29 #include "DocLoader.h"
    29 #include "DocLoader.h"
    30 #include "Document.h"
    30 #include "Document.h"
    31 #include "Frame.h"
    31 #include "Frame.h"
    32 #include "FrameLoader.h"
    32 #include "FrameLoader.h"
   190 
   190 
   191     String type = m_type.lower();
   191     String type = m_type.lower();
   192 
   192 
   193     // IE extension: location of small icon for locationbar / bookmarks
   193     // IE extension: location of small icon for locationbar / bookmarks
   194     // We'll record this URL per document, even if we later only use it in top level frames
   194     // We'll record this URL per document, even if we later only use it in top level frames
   195     if (m_isIcon && !m_url.isEmpty()) {
   195     if (m_isIcon && !m_url.isEmpty())
   196         document()->setIconURL(m_url, type);
   196         document()->setIconURL(m_url, type);
   197         if(document()->frame() && document()->frame()->loader()) {
       
   198             // Notify frame loader to retry icon loading
       
   199             document()->frame()->loader()->iconLoadDecisionAvailable();
       
   200         }
       
   201     }
       
   202 
   197 
   203     // Stylesheet
   198     // Stylesheet
   204     // This was buggy and would incorrectly match <link rel="alternate">, which has a different specified meaning. -dwh
   199     // This was buggy and would incorrectly match <link rel="alternate">, which has a different specified meaning. -dwh
   205     if (m_disabledState != 2 && (type.contains("text/css") || m_isStyleSheet) && document()->frame()) {
   200     if (m_disabledState != 2 && (type.contains("text/css") || m_isStyleSheet) && document()->frame()) {
   206         // no need to load style sheets which aren't for the screen output
   201         // no need to load style sheets which aren't for the screen output