diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-25 13:02:02 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-25 13:02:02 +0200 |
commit | 715be629d51174233403237bfc563cf150087dc8 (patch) | |
tree | 4cff72df808db977624338b0a38d8b6d1bd73c57 /Source/WebCore/dom/StyleElement.cpp | |
parent | dc6262b587c71c14e30d93e57ed812e36a79a33e (diff) | |
download | qtwebkit-715be629d51174233403237bfc563cf150087dc8.tar.gz |
Imported WebKit commit ce614b0924ba46f78d4435e28ff93c8525fbb7cc (http://svn.webkit.org/repository/webkit/trunk@129485)
New snapshot that includes MingW build fixes
Diffstat (limited to 'Source/WebCore/dom/StyleElement.cpp')
-rw-r--r-- | Source/WebCore/dom/StyleElement.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/WebCore/dom/StyleElement.cpp b/Source/WebCore/dom/StyleElement.cpp index dd4de2901..ff22fe9db 100644 --- a/Source/WebCore/dom/StyleElement.cpp +++ b/Source/WebCore/dom/StyleElement.cpp @@ -24,6 +24,7 @@ #include "Attribute.h" #include "ContentSecurityPolicy.h" #include "Document.h" +#include "DocumentStyleSheetCollection.h" #include "Element.h" #include "MediaList.h" #include "MediaQueryEvaluator.h" @@ -63,7 +64,7 @@ void StyleElement::insertedIntoDocument(Document* document, Element* element) { ASSERT(document); ASSERT(element); - document->addStyleSheetCandidateNode(element, m_createdByParser); + document->styleSheetCollection()->addStyleSheetCandidateNode(element, m_createdByParser); if (m_createdByParser) return; @@ -74,7 +75,7 @@ void StyleElement::removedFromDocument(Document* document, Element* element) { ASSERT(document); ASSERT(element); - document->removeStyleSheetCandidateNode(element); + document->styleSheetCollection()->removeStyleSheetCandidateNode(element); if (m_sheet) clearSheet(); @@ -90,7 +91,7 @@ void StyleElement::clearDocumentData(Document* document, Element* element) m_sheet->clearOwnerNode(); if (element->inDocument()) - document->removeStyleSheetCandidateNode(element); + document->styleSheetCollection()->removeStyleSheetCandidateNode(element); } void StyleElement::childrenChanged(Element* element) @@ -152,7 +153,7 @@ void StyleElement::createSheet(Element* e, WTF::OrdinalNumber startLineNumber, c Document* document = e->document(); if (m_sheet) { if (m_sheet->isLoading()) - document->removePendingSheet(); + document->styleSheetCollection()->removePendingSheet(); clearSheet(); } @@ -168,7 +169,7 @@ void StyleElement::createSheet(Element* e, WTF::OrdinalNumber startLineNumber, c MediaQueryEvaluator screenEval("screen", true); MediaQueryEvaluator printEval("print", true); if (screenEval.eval(mediaQueries.get()) || printEval.eval(mediaQueries.get())) { - document->addPendingSheet(); + document->styleSheetCollection()->addPendingSheet(); m_loading = true; m_sheet = CSSStyleSheet::createInline(e, KURL(), document->inputEncoding()); @@ -197,14 +198,14 @@ bool StyleElement::sheetLoaded(Document* document) if (isLoading()) return false; - document->removePendingSheet(); + document->styleSheetCollection()->removePendingSheet(); return true; } void StyleElement::startLoadingDynamicSheet(Document* document) { ASSERT(document); - document->addPendingSheet(); + document->styleSheetCollection()->addPendingSheet(); } } |