Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(553)

Unified Diff: Source/core/dom/Document.cpp

Issue 23516012: Rename StyleSheetCollections to StyleEngine. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/dom/DocumentStyleSheetCollection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Document.cpp
diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp
index 72955584b9350eb3231be22bc7ccf5359d6daeda..057ecd1ff90aeed039d1a13864b1ccc2129e07fe 100644
--- a/Source/core/dom/Document.cpp
+++ b/Source/core/dom/Document.cpp
@@ -94,7 +94,7 @@
#include "core/dom/ScriptRunner.h"
#include "core/dom/ScriptedAnimationController.h"
#include "core/dom/SelectorQuery.h"
-#include "core/dom/StyleSheetCollections.h"
+#include "core/dom/StyleEngine.h"
#include "core/dom/TouchList.h"
#include "core/dom/TransformSource.h"
#include "core/dom/TreeWalker.h"
@@ -404,7 +404,7 @@ Document::Document(const DocumentInit& initializer, DocumentClassFlags documentC
, m_domTreeVersion(++s_globalTreeVersion)
, m_listenerTypes(0)
, m_mutationObserverTypes(0)
- , m_styleSheetCollections(StyleSheetCollections::create(*this))
+ , m_StyleEngine(StyleEngine::create(*this))
, m_visitedLinkState(VisitedLinkState::create(this))
, m_visuallyOrdered(false)
, m_readyState(Complete)
@@ -543,7 +543,7 @@ Document::~Document()
m_import = 0;
}
- m_styleSheetCollections.clear();
+ m_StyleEngine.clear();
if (m_elemSheet)
m_elemSheet->clearOwnerNode();
@@ -640,8 +640,8 @@ void Document::setCompatibilityMode(CompatibilityMode mode)
selectorQueryCache()->invalidate();
if (inQuirksMode() != wasInQuirksMode) {
// All user stylesheets have to reparse using the different mode.
- m_styleSheetCollections->clearPageUserSheet();
- m_styleSheetCollections->invalidateInjectedStyleSheetCache();
+ m_StyleEngine->clearPageUserSheet();
+ m_StyleEngine->invalidateInjectedStyleSheetCache();
}
}
@@ -1690,13 +1690,13 @@ void Document::recalcStyle(StyleRecalcChange change)
// re-attaching our containing iframe, which when asked HTMLFrameElementBase::isURLAllowed
// hits a null-dereference due to security code always assuming the document has a SecurityOrigin.
- if (m_styleSheetCollections->needsUpdateActiveStylesheetsOnStyleRecalc())
- m_styleSheetCollections->updateActiveStyleSheets(FullStyleUpdate);
+ if (m_StyleEngine->needsUpdateActiveStylesheetsOnStyleRecalc())
+ m_StyleEngine->updateActiveStyleSheets(FullStyleUpdate);
InspectorInstrumentationCookie cookie = InspectorInstrumentation::willRecalculateStyle(this);
if (m_elemSheet && m_elemSheet->contents()->usesRemUnits())
- m_styleSheetCollections->setUsesRemUnit(true);
+ m_StyleEngine->setUsesRemUnit(true);
m_inStyleRecalc = true;
{
@@ -1742,15 +1742,15 @@ void Document::recalcStyle(StyleRecalcChange change)
unscheduleStyleRecalc();
// FIXME: SVG <use> element can schedule a recalc in the middle of an already running one.
- // See StyleSheetCollections::updateActiveStyleSheets.
- if (m_styleSheetCollections->needsUpdateActiveStylesheetsOnStyleRecalc())
+ // See StyleEngine::updateActiveStyleSheets.
+ if (m_StyleEngine->needsUpdateActiveStylesheetsOnStyleRecalc())
setNeedsStyleRecalc();
m_inStyleRecalc = false;
// Pseudo element removal and similar may only work with these flags still set. Reset them after the style recalc.
if (m_styleResolver) {
- m_styleSheetCollections->resetCSSFeatureFlags(m_styleResolver->ruleFeatureSet());
+ m_StyleEngine->resetCSSFeatureFlags(m_styleResolver->ruleFeatureSet());
m_styleResolver->clearStyleSharingList();
}
@@ -1972,7 +1972,7 @@ void Document::createStyleResolver()
if (Settings* docSettings = settings())
matchAuthorAndUserStyles = docSettings->authorAndUserStylesEnabled();
m_styleResolver = adoptPtr(new StyleResolver(*this, matchAuthorAndUserStyles));
- m_styleSheetCollections->combineCSSFeatureFlags(m_styleResolver->ruleFeatureSet());
+ m_StyleEngine->combineCSSFeatureFlags(m_styleResolver->ruleFeatureSet());
}
void Document::clearStyleResolver()
@@ -2813,7 +2813,7 @@ Frame* Document::findUnsafeParentScrollPropagationBoundary()
void Document::seamlessParentUpdatedStylesheets()
{
- m_styleSheetCollections->didModifySeamlessParentStyleSheet();
+ m_StyleEngine->didModifySeamlessParentStyleSheet();
styleResolverChanged(RecalcStyleImmediately);
}
@@ -2889,8 +2889,8 @@ void Document::processHttpEquivDefaultStyle(const String& content)
// For more info, see the test at:
// http://www.hixie.ch/tests/evil/css/import/main/preferred.html
// -dwh
- m_styleSheetCollections->setSelectedStylesheetSetName(content);
- m_styleSheetCollections->setPreferredStylesheetSetName(content);
+ m_StyleEngine->setSelectedStylesheetSetName(content);
+ m_StyleEngine->setPreferredStylesheetSetName(content);
styleResolverChanged(RecalcStyleDeferred);
}
@@ -3264,17 +3264,17 @@ StyleSheetList* Document::styleSheets()
String Document::preferredStylesheetSet() const
{
- return m_styleSheetCollections->preferredStylesheetSetName();
+ return m_StyleEngine->preferredStylesheetSetName();
}
String Document::selectedStylesheetSet() const
{
- return m_styleSheetCollections->selectedStylesheetSetName();
+ return m_StyleEngine->selectedStylesheetSetName();
}
void Document::setSelectedStylesheetSet(const String& aString)
{
- m_styleSheetCollections->setSelectedStylesheetSetName(aString);
+ m_StyleEngine->setSelectedStylesheetSetName(aString);
styleResolverChanged(RecalcStyleDeferred);
}
@@ -3294,9 +3294,9 @@ void Document::styleResolverChanged(StyleResolverUpdateType updateType, StyleRes
}
m_didCalculateStyleResolver = true;
- bool needsRecalc = m_styleSheetCollections->updateActiveStyleSheets(updateMode);
+ bool needsRecalc = m_StyleEngine->updateActiveStyleSheets(updateMode);
- if (didLayoutWithPendingStylesheets() && !m_styleSheetCollections->hasPendingSheets()) {
+ if (didLayoutWithPendingStylesheets() && !m_StyleEngine->hasPendingSheets()) {
// We need to manually repaint because we avoid doing all repaints in layout or style
// recalc while sheets are still loading to avoid FOUC.
m_pendingSheetLayout = IgnoreLayoutWithPendingSheets;
@@ -5373,7 +5373,7 @@ void Document::updateHoverActiveState(const HitTestRequest& request, Element* in
bool Document::haveStylesheetsLoaded() const
{
- return !m_styleSheetCollections->hasPendingSheets() || m_ignorePendingStylesheets;
+ return !m_StyleEngine->hasPendingSheets() || m_ignorePendingStylesheets;
}
Locale& Document::getCachedLocale(const AtomicString& locale)
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/dom/DocumentStyleSheetCollection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698