Merge 125988

Source/WebCore/html/HTMLLinkElement.cpp

Index: Source/WebCore/html/HTMLLinkElement.cpp
===================================================================
--- Source/WebCore/html/HTMLLinkElement.cpp	(revision 126674)
+++ Source/WebCore/html/HTMLLinkElement.cpp	(working copy)
@@ -278,7 +278,7 @@
         clearSheet();
 
     if (styleSheetIsLoading())
-        removePendingSheet();
+        removePendingSheet(RemovePendingSheetNotifyLater);
 
     if (document()->renderer())
         document()->styleResolverChanged(DeferRecalcStyle);
@@ -458,7 +458,7 @@
     document()->addPendingSheet();
 }
 
-void HTMLLinkElement::removePendingSheet()
+void HTMLLinkElement::removePendingSheet(RemovePendingSheetNotificationType notification)
 {
     PendingSheetType type = m_pendingSheetType;
     m_pendingSheetType = None;
@@ -470,7 +470,11 @@
         document()->styleResolverChanged(RecalcStyleImmediately);
         return;
     }
-    document()->removePendingSheet();
+
+    document()->removePendingSheet(
+        notification == RemovePendingSheetNotifyImmediately
+        ? Document::RemovePendingSheetNotifyImmediately
+        : Document::RemovePendingSheetNotifyLater);
 }
 
 DOMSettableTokenList* HTMLLinkElement::sizes() const