Merge 113887

Source/WebCore/dom/StyleElement.cpp

 /*
  * Copyright (C) 2006, 2007 Rob Buis
  * Copyright (C) 2008 Apple, 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 56 matching lines @@
 
     process(element);
 }
 
 void StyleElement::removedFromDocument(Document* document, Element* element)
 {
     ASSERT(document);
     ASSERT(element);
     document->removeStyleSheetCandidateNode(element);
 
-    if (m_sheet) {
-        ASSERT(m_sheet->ownerNode() == element);
-        m_sheet->clearOwnerNode();
-        m_sheet = 0;
-    }
+    if (m_sheet)
+        clearSheet();
 
     // If we're in document teardown, then we don't need to do any notification of our sheet's removal.
     if (document->renderer())
         document->styleSelectorChanged(DeferRecalcStyle);
 }
 
 void StyleElement::clearDocumentData(Document* document, Element* element)
 {
     if (m_sheet)
         m_sheet->clearOwnerNode();
@@ skipping 40 matching lines @@
     for (Node* c = e->firstChild(); c; c = c->nextSibling()) {
         if (isValidStyleChild(c)) {
             sheetText.append(c->nodeValue());
         }
     }
     ASSERT(sheetText.length() == resultLength);
 
     createSheet(e, m_startLineNumber, sheetText.toString());
 }
 
+void StyleElement::clearSheet()
+{
+    ASSERT(m_sheet);
+    m_sheet->clearOwnerNode();
+    m_sheet = 0;
+}
+
 void StyleElement::createSheet(Element* e, int startLineNumber, const String& text)
 {
     ASSERT(e);
     ASSERT(e->inDocument());
     Document* document = e->document();
     if (m_sheet) {
         if (m_sheet->isLoading())
             document->removePendingSheet();
-        m_sheet = 0;
+        clearSheet();
     }
 
     // If type is empty or CSS, this is a CSS style sheet.
     const AtomicString& type = this->type();
     if (document->contentSecurityPolicy()->allowInlineStyle() && isCSS(e, type)) {
         RefPtr<MediaQuerySet> mediaQueries;
         if (e->isHTMLElement())
             mediaQueries = MediaQuerySet::createAllowingDescriptionSyntax(media());
         else
             mediaQueries = MediaQuerySet::create(media());
@@ skipping 32 matching lines @@
     return true;
 }
 
 void StyleElement::startLoadingDynamicSheet(Document* document)
 {
     ASSERT(document);
     document->addPendingSheet();
 }
 
 }