Merge 125988

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 260 matching lines @@
     if (m_isInShadowTree) {
         ASSERT(!m_sheet);
         return;
     }
     document()->removeStyleSheetCandidateNode(this);
 
     if (m_sheet)
         clearSheet();
 
     if (styleSheetIsLoading())
-        removePendingSheet();
+        removePendingSheet(RemovePendingSheetNotifyLater);
 
     if (document()->renderer())
         document()->styleResolverChanged(DeferRecalcStyle);
 }
 
 void HTMLLinkElement::finishParsingChildren()
 {
     m_createdByParser = false;
     HTMLElement::finishParsingChildren();
 }
@@ skipping 159 matching lines @@
 {
     if (type <= m_pendingSheetType)
         return;
     m_pendingSheetType = type;
 
     if (m_pendingSheetType == NonBlocking)
         return;
     document()->addPendingSheet();
 }
 
-void HTMLLinkElement::removePendingSheet()
+void HTMLLinkElement::removePendingSheet(RemovePendingSheetNotificationType notification)
 {
     PendingSheetType type = m_pendingSheetType;
     m_pendingSheetType = None;
 
     if (type == None)
         return;
     if (type == NonBlocking) {
         // Document::removePendingSheet() triggers the style selector recalc for blocking sheets.
         document()->styleResolverChanged(RecalcStyleImmediately);
         return;
     }
-    document()->removePendingSheet();
+
+    document()->removePendingSheet(
+        notification == RemovePendingSheetNotifyImmediately
+        ? Document::RemovePendingSheetNotifyImmediately
+        : Document::RemovePendingSheetNotifyLater);
 }
 
 DOMSettableTokenList* HTMLLinkElement::sizes() const
 {
     return m_sizes.get();
 }
 
 void HTMLLinkElement::setSizes(const String& value)
 {
     m_sizes->setValue(value);
 }
 
 #if ENABLE(MICRODATA)
 String HTMLLinkElement::itemValueText() const
 {
     return getURLAttribute(hrefAttr);
 }
 
 void HTMLLinkElement::setItemValueText(const String& value, ExceptionCode&)
 {
     setAttribute(hrefAttr, value);
 }
 #endif
 
 } // namespace WebCore