| Index: Source/core/dom/DocumentStyleSheetCollection.cpp
|
| diff --git a/Source/core/dom/DocumentStyleSheetCollection.cpp b/Source/core/dom/DocumentStyleSheetCollection.cpp
|
| index fce6dffbd8a75a613405a3b91ead200363458d98..c4e18a94a385a371d9c821d07652dec70b41dbe7 100644
|
| --- a/Source/core/dom/DocumentStyleSheetCollection.cpp
|
| +++ b/Source/core/dom/DocumentStyleSheetCollection.cpp
|
| @@ -34,7 +34,7 @@
|
| #include "core/dom/Document.h"
|
| #include "core/dom/Element.h"
|
| #include "core/dom/ProcessingInstruction.h"
|
| -#include "core/dom/StyleSheetCollections.h"
|
| +#include "core/dom/StyleEngine.h"
|
| #include "core/html/HTMLIFrameElement.h"
|
| #include "core/html/HTMLLinkElement.h"
|
| #include "core/html/HTMLStyleElement.h"
|
| @@ -51,7 +51,7 @@ DocumentStyleSheetCollection::DocumentStyleSheetCollection(TreeScope& treeScope)
|
| ASSERT(treeScope.rootNode() == &treeScope.rootNode()->document());
|
| }
|
|
|
| -void DocumentStyleSheetCollection::collectStyleSheets(StyleSheetCollections* collections, Vector<RefPtr<StyleSheet> >& styleSheets, Vector<RefPtr<CSSStyleSheet> >& activeSheets)
|
| +void DocumentStyleSheetCollection::collectStyleSheets(StyleEngine* collections, Vector<RefPtr<StyleSheet> >& styleSheets, Vector<RefPtr<CSSStyleSheet> >& activeSheets)
|
| {
|
| if (document()->settings() && !document()->settings()->authorAndUserStylesEnabled())
|
| return;
|
| @@ -143,10 +143,10 @@ static void collectActiveCSSStyleSheetsFromSeamlessParents(Vector<RefPtr<CSSStyl
|
| HTMLIFrameElement* seamlessParentIFrame = document->seamlessParentIFrame();
|
| if (!seamlessParentIFrame)
|
| return;
|
| - sheets.append(seamlessParentIFrame->document().styleSheetCollections()->activeAuthorStyleSheets());
|
| + sheets.append(seamlessParentIFrame->document().styleEngine()->activeAuthorStyleSheets());
|
| }
|
|
|
| -bool DocumentStyleSheetCollection::updateActiveStyleSheets(StyleSheetCollections* collections, StyleResolverUpdateMode updateMode)
|
| +bool DocumentStyleSheetCollection::updateActiveStyleSheets(StyleEngine* collections, StyleResolverUpdateMode updateMode)
|
| {
|
| Vector<RefPtr<StyleSheet> > styleSheets;
|
| Vector<RefPtr<CSSStyleSheet> > activeCSSStyleSheets;
|
|
|