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

Unified Diff: Source/core/page/PageGroup.cpp

Issue 25505007: Remove bogus use of the term "user style" in Blink and Blink API (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Patch for landing Created 7 years, 2 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/page/PageGroup.h ('k') | Source/core/page/UserContentTypes.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/PageGroup.cpp
diff --git a/Source/core/page/PageGroup.cpp b/Source/core/page/PageGroup.cpp
index 29b1937fac13b868c6ca5004c6305d4dafddc083..8e35a9083a99e3b8e7295c63205ca923ef3d5f1c 100644
--- a/Source/core/page/PageGroup.cpp
+++ b/Source/core/page/PageGroup.cpp
@@ -39,7 +39,7 @@ PageGroup::PageGroup()
PageGroup::~PageGroup()
{
- removeAllUserContent();
+ removeInjectedStyleSheets();
}
PageGroup* PageGroup::sharedGroup()
@@ -68,21 +68,15 @@ void PageGroup::removePage(Page* page)
m_pages.remove(page);
}
-void PageGroup::addUserStyleSheet(const String& source, const KURL& url,
- const Vector<String>& whitelist, const Vector<String>& blacklist,
- UserContentInjectedFrames injectedFrames,
- UserStyleLevel level,
- UserStyleInjectionTime injectionTime)
+void PageGroup::injectStyleSheet(const String& source, const Vector<String>& whitelist, StyleInjectionTarget injectIn)
{
- m_userStyleSheets.append(adoptPtr(new UserStyleSheet(source, url, whitelist, blacklist, injectedFrames, level)));
-
- if (injectionTime == InjectInExistingDocuments)
- invalidatedInjectedStyleSheetCacheInAllFrames();
+ m_injectedStyleSheets.append(adoptPtr(new InjectedStyleSheet(source, whitelist, injectIn)));
+ invalidatedInjectedStyleSheetCacheInAllFrames();
}
-void PageGroup::removeAllUserContent()
+void PageGroup::removeInjectedStyleSheets()
{
- m_userStyleSheets.clear();
+ m_injectedStyleSheets.clear();
invalidatedInjectedStyleSheetCacheInAllFrames();
}
« no previous file with comments | « Source/core/page/PageGroup.h ('k') | Source/core/page/UserContentTypes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698