Merge 113229

Source/WebCore/html/HTMLLinkElement.cpp

Index: Source/WebCore/html/HTMLLinkElement.cpp
===================================================================
--- Source/WebCore/html/HTMLLinkElement.cpp	(revision 114851)
+++ Source/WebCore/html/HTMLLinkElement.cpp	(working copy)
@@ -82,10 +82,8 @@
     if (m_sheet)
         m_sheet->clearOwnerNode();
 
-    if (m_cachedSheet) {
+    if (m_cachedSheet)
         m_cachedSheet->removeClient(this);
-        removePendingSheet();
-    }
 
     if (inDocument())
         document()->removeStyleSheetCandidateNode(this);
@@ -266,6 +264,9 @@
         m_sheet = 0;
     }
 
+    if (styleSheetIsLoading())
+        removePendingSheet();
+
     if (document()->renderer())
         document()->styleSelectorChanged(DeferRecalcStyle);
 }