Merge 113887

Source/WebCore/html/HTMLLinkElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Rob Buis (rwlbuis@gmail.com)
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 212 matching lines @@
         
         if (m_cachedSheet)
             m_cachedSheet->addClient(this);
         else {
             // The request may have been denied if (for example) the stylesheet is local and the document is remote.
             m_loading = false;
             removePendingSheet();
         }
     } else if (m_sheet) {
         // we no longer contain a stylesheet, e.g. perhaps rel or type was changed
-        m_sheet = 0;
+        clearSheet();
         document()->styleSelectorChanged(DeferRecalcStyle);
     }
 }
 
+void HTMLLinkElement::clearSheet()
+{
+    ASSERT(m_sheet);
+    ASSERT(m_sheet->ownerNode() == this);
+    m_sheet->clearOwnerNode();
+    m_sheet = 0;
+}
+
 void HTMLLinkElement::insertedIntoDocument()
 {
     HTMLElement::insertedIntoDocument();
 
     m_isInShadowTree = isInShadowTree();
     if (m_isInShadowTree)
         return;
 
     document()->addStyleSheetCandidateNode(this, m_createdByParser);
 
     process();
 }
 
 void HTMLLinkElement::removedFromDocument()
 {
     HTMLElement::removedFromDocument();
 
     if (m_isInShadowTree) {
         ASSERT(!m_sheet);
         return;
     }
     document()->removeStyleSheetCandidateNode(this);
 
-    if (m_sheet) {
-        ASSERT(m_sheet->ownerNode() == this);
-        m_sheet->clearOwnerNode();
-        m_sheet = 0;
-    }
+    if (m_sheet)
+        clearSheet();
 
     if (styleSheetIsLoading())
         removePendingSheet();
 
     if (document()->renderer())
         document()->styleSelectorChanged(DeferRecalcStyle);
 }
 
 void HTMLLinkElement::finishParsingChildren()
 {
@@ skipping 211 matching lines @@
     return getURLAttribute(hrefAttr);
 }
 
 void HTMLLinkElement::setItemValueText(const String& value, ExceptionCode&)
 {
     setAttribute(hrefAttr, value);
 }
 #endif
 
 } // namespace WebCore