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

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

Issue 1050783003: Remove stylesheet injection from Blink. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Revert devtool removals Created 5 years, 9 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/StyleEngine.h ('k') | Source/core/page/InjectedStyleSheets.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/StyleEngine.cpp
diff --git a/Source/core/dom/StyleEngine.cpp b/Source/core/dom/StyleEngine.cpp
index 308f0a7681c6cd098648fd221ab57f36ba21c4be..82cffa4148fe2e2a7cf6ee6f82d54f5d04735b28 100644
--- a/Source/core/dom/StyleEngine.cpp
+++ b/Source/core/dom/StyleEngine.cpp
@@ -44,10 +44,8 @@
#include "core/html/HTMLLinkElement.h"
#include "core/html/imports/HTMLImportsController.h"
#include "core/inspector/InspectorInstrumentation.h"
-#include "core/page/InjectedStyleSheets.h"
#include "core/page/Page.h"
#include "core/svg/SVGStyleElement.h"
-#include "platform/URLPatternMatcher.h"
namespace blink {
@@ -57,7 +55,6 @@ StyleEngine::StyleEngine(Document& document)
: m_document(&document)
, m_isMaster(!document.importsController() || document.importsController()->master() == &document)
, m_pendingStylesheets(0)
- , m_injectedStyleSheetCacheValid(false)
, m_documentStyleSheetCollection(DocumentStyleSheetCollection::create(document))
, m_documentScopeDirty(true)
, m_usesSiblingRules(false)
@@ -91,8 +88,6 @@ void StyleEngine::detachFromDocument()
// Cleanup is performed eagerly when the StyleEngine is removed from the
// document. The StyleEngine is unreachable after this, since only the
// document has a reference to it.
- for (unsigned i = 0; i < m_injectedAuthorStyleSheets.size(); ++i)
- m_injectedAuthorStyleSheets[i]->clearOwnerNode();
for (unsigned i = 0; i < m_authorStyleSheets.size(); ++i)
m_authorStyleSheets[i]->clearOwnerNode();
@@ -231,51 +226,6 @@ void StyleEngine::resetCSSFeatureFlags(const RuleFeatureSet& features)
m_maxDirectAdjacentSelectors = features.maxDirectAdjacentSelectors();
}
-const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>& StyleEngine::injectedAuthorStyleSheets() const
-{
- updateInjectedStyleSheetCache();
- return m_injectedAuthorStyleSheets;
-}
-
-void StyleEngine::updateInjectedStyleSheetCache() const
-{
- if (m_injectedStyleSheetCacheValid)
- return;
- m_injectedStyleSheetCacheValid = true;
- m_injectedAuthorStyleSheets.clear();
-
- Page* owningPage = document().page();
- if (!owningPage)
- return;
-
- const InjectedStyleSheetEntryVector& entries = InjectedStyleSheets::instance().entries();
- for (unsigned i = 0; i < entries.size(); ++i) {
- const InjectedStyleSheetEntry* entry = entries[i].get();
- if (entry->injectedFrames() == InjectStyleInTopFrameOnly && document().ownerElement())
- continue;
- if (!URLPatternMatcher::matchesPatterns(document().url(), entry->whitelist()))
- continue;
- RefPtrWillBeRawPtr<CSSStyleSheet> groupSheet = CSSStyleSheet::createInline(m_document, KURL());
- m_injectedAuthorStyleSheets.append(groupSheet);
- groupSheet->contents()->parseString(entry->source());
- }
-}
-
-void StyleEngine::invalidateInjectedStyleSheetCache()
-{
- m_injectedStyleSheetCacheValid = false;
- markDocumentDirty();
- // FIXME: updateInjectedStyleSheetCache is called inside StyleSheetCollection::updateActiveStyleSheets
- // and batch updates lots of sheets so we can't call addedStyleSheet() or removedStyleSheet().
- document().styleResolverChanged();
-}
-
-void StyleEngine::compatibilityModeChanged()
-{
- if (!m_injectedAuthorStyleSheets.isEmpty())
- invalidateInjectedStyleSheetCache();
-}
-
void StyleEngine::addAuthorSheet(PassRefPtrWillBeRawPtr<StyleSheetContents> authorSheet)
{
m_authorStyleSheets.append(CSSStyleSheet::create(authorSheet, m_document));
« no previous file with comments | « Source/core/dom/StyleEngine.h ('k') | Source/core/page/InjectedStyleSheets.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698