<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[162395] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/162395">162395</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-20 17:51:03 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move user style sheet handling to UserContentController
https://bugs.webkit.org/show_bug.cgi?id=127322
<rdar://problem/15861296>
Reviewed by Andreas Kling.
* dom/DocumentStyleSheetCollection.cpp:
(WebCore::DocumentStyleSheetCollection::updateInjectedStyleSheetCache):
* page/PageGroup.cpp:
(WebCore::PageGroup::addUserStyleSheetToWorld):
(WebCore::PageGroup::removeUserStyleSheetFromWorld):
(WebCore::PageGroup::removeUserStyleSheetsFromWorld):
(WebCore::PageGroup::removeAllUserContent):
* page/PageGroup.h:
* page/UserContentController.cpp:
(WebCore::UserContentController::addUserStyleSheet):
(WebCore::UserContentController::removeUserStyleSheet):
(WebCore::UserContentController::removeUserStyleSheets):
(WebCore::UserContentController::removeAllUserContent):
(WebCore::UserContentController::invalidateInjectedStyleSheetCacheInAllFrames):
* page/UserContentController.h:
(WebCore::UserContentController::userStyleSheets):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentStyleSheetCollectioncpp">trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFramecpp">trunk/Source/WebCore/page/Frame.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageGroupcpp">trunk/Source/WebCore/page/PageGroup.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageGrouph">trunk/Source/WebCore/page/PageGroup.h</a></li>
<li><a href="#trunkSourceWebCorepageUserContentControllercpp">trunk/Source/WebCore/page/UserContentController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageUserContentControllerh">trunk/Source/WebCore/page/UserContentController.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162394 => 162395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-21 01:31:37 UTC (rev 162394)
+++ trunk/Source/WebCore/ChangeLog 2014-01-21 01:51:03 UTC (rev 162395)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-01-20 Anders Carlsson <andersca@apple.com>
+
+ Move user style sheet handling to UserContentController
+ https://bugs.webkit.org/show_bug.cgi?id=127322
+ <rdar://problem/15861296>
+
+ Reviewed by Andreas Kling.
+
+ * dom/DocumentStyleSheetCollection.cpp:
+ (WebCore::DocumentStyleSheetCollection::updateInjectedStyleSheetCache):
+ * page/PageGroup.cpp:
+ (WebCore::PageGroup::addUserStyleSheetToWorld):
+ (WebCore::PageGroup::removeUserStyleSheetFromWorld):
+ (WebCore::PageGroup::removeUserStyleSheetsFromWorld):
+ (WebCore::PageGroup::removeAllUserContent):
+ * page/PageGroup.h:
+ * page/UserContentController.cpp:
+ (WebCore::UserContentController::addUserStyleSheet):
+ (WebCore::UserContentController::removeUserStyleSheet):
+ (WebCore::UserContentController::removeUserStyleSheets):
+ (WebCore::UserContentController::removeAllUserContent):
+ (WebCore::UserContentController::invalidateInjectedStyleSheetCacheInAllFrames):
+ * page/UserContentController.h:
+ (WebCore::UserContentController::userStyleSheets):
+
</ins><span class="cx"> 2014-01-20 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add a nicer way to iterate over all the attributes of an element
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentStyleSheetCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp (162394 => 162395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2014-01-21 01:31:37 UTC (rev 162394)
+++ trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2014-01-21 01:51:03 UTC (rev 162395)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "StyleSheetContents.h"
</span><span class="cx"> #include "StyleSheetList.h"
</span><ins>+#include "UserContentController.h"
</ins><span class="cx"> #include "UserContentURLPattern.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -140,27 +141,30 @@
</span><span class="cx"> Page* owningPage = m_document.page();
</span><span class="cx"> if (!owningPage)
</span><span class="cx"> return;
</span><del>-
- const PageGroup& pageGroup = owningPage->group();
- const UserStyleSheetMap* sheetsMap = pageGroup.userStyleSheets();
- if (!sheetsMap)
</del><ins>+
+ const auto* userContentController = owningPage->userContentController();
+ if (!userContentController)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- UserStyleSheetMap::const_iterator end = sheetsMap->end();
- for (UserStyleSheetMap::const_iterator it = sheetsMap->begin(); it != end; ++it) {
- const UserStyleSheetVector* sheets = it->value.get();
- for (unsigned i = 0; i < sheets->size(); ++i) {
- const UserStyleSheet* sheet = sheets->at(i).get();
</del><ins>+ const UserStyleSheetMap* userStyleSheets = userContentController->userStyleSheets();
+ if (!userStyleSheets)
+ return;
+
+ for (auto& styleSheets : userStyleSheets->values()) {
+ for (const auto& sheet : *styleSheets) {
</ins><span class="cx"> if (sheet->injectedFrames() == InjectInTopFrameOnly && m_document.ownerElement())
</span><span class="cx"> continue;
</span><ins>+
</ins><span class="cx"> if (!UserContentURLPattern::matchesPatterns(m_document.url(), sheet->whitelist(), sheet->blacklist()))
</span><span class="cx"> continue;
</span><ins>+
</ins><span class="cx"> RefPtr<CSSStyleSheet> groupSheet = CSSStyleSheet::createInline(const_cast<Document&>(m_document), sheet->url());
</span><span class="cx"> bool isUserStyleSheet = sheet->level() == UserStyleUserLevel;
</span><span class="cx"> if (isUserStyleSheet)
</span><span class="cx"> m_injectedUserStyleSheets.append(groupSheet);
</span><span class="cx"> else
</span><span class="cx"> m_injectedAuthorStyleSheets.append(groupSheet);
</span><ins>+
</ins><span class="cx"> groupSheet->contents().setIsUserStyleSheet(isUserStyleSheet);
</span><span class="cx"> groupSheet->contents().parseString(sheet->source());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.cpp (162394 => 162395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.cpp 2014-01-21 01:31:37 UTC (rev 162394)
+++ trunk/Source/WebCore/page/Frame.cpp 2014-01-21 01:51:03 UTC (rev 162395)
</span><span class="lines">@@ -704,7 +704,7 @@
</span><span class="cx"> if (loader().stateMachine()->creatingInitialEmptyDocument() && !settings().shouldInjectUserScriptsInInitialEmptyDocument())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- UserContentController* userContentController = m_page->userContentController();
</del><ins>+ const auto* userContentController = m_page->userContentController();
</ins><span class="cx"> if (!userContentController)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageGroup.cpp (162394 => 162395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageGroup.cpp 2014-01-21 01:31:37 UTC (rev 162394)
+++ trunk/Source/WebCore/page/PageGroup.cpp 2014-01-21 01:51:03 UTC (rev 162395)
</span><span class="lines">@@ -286,15 +286,8 @@
</span><span class="cx"> void PageGroup::addUserStyleSheetToWorld(DOMWrapperWorld& world, const String& source, const URL& url, const Vector<String>& whitelist, const Vector<String>& blacklist, UserContentInjectedFrames injectedFrames, UserStyleLevel level, UserStyleInjectionTime injectionTime)
</span><span class="cx"> {
</span><span class="cx"> auto userStyleSheet = std::make_unique<UserStyleSheet>(source, url, whitelist, blacklist, injectedFrames, level);
</span><del>- if (!m_userStyleSheets)
- m_userStyleSheets = std::make_unique<UserStyleSheetMap>();
- std::unique_ptr<UserStyleSheetVector>& styleSheetsInWorld = m_userStyleSheets->add(&world, nullptr).iterator->value;
- if (!styleSheetsInWorld)
- styleSheetsInWorld = std::make_unique<UserStyleSheetVector>();
- styleSheetsInWorld->append(std::move(userStyleSheet));
</del><ins>+ m_userContentController->addUserStyleSheet(world, std::move(userStyleSheet), injectionTime);
</ins><span class="cx">
</span><del>- if (injectionTime == InjectInExistingDocuments)
- invalidateInjectedStyleSheetCacheInAllFrames();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageGroup::removeUserScriptFromWorld(DOMWrapperWorld& world, const URL& url)
</span><span class="lines">@@ -304,29 +297,7 @@
</span><span class="cx">
</span><span class="cx"> void PageGroup::removeUserStyleSheetFromWorld(DOMWrapperWorld& world, const URL& url)
</span><span class="cx"> {
</span><del>- if (!m_userStyleSheets)
- return;
-
- auto it = m_userStyleSheets->find(&world);
- bool sheetsChanged = false;
- if (it == m_userStyleSheets->end())
- return;
-
- auto stylesheets = it->value.get();
- for (int i = stylesheets->size() - 1; i >= 0; --i) {
- if (stylesheets->at(i)->url() == url) {
- stylesheets->remove(i);
- sheetsChanged = true;
- }
- }
-
- if (!sheetsChanged)
- return;
-
- if (stylesheets->isEmpty())
- m_userStyleSheets->remove(it);
-
- invalidateInjectedStyleSheetCacheInAllFrames();
</del><ins>+ m_userContentController->removeUserStyleSheet(world, url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageGroup::removeUserScriptsFromWorld(DOMWrapperWorld& world)
</span><span class="lines">@@ -336,36 +307,14 @@
</span><span class="cx">
</span><span class="cx"> void PageGroup::removeUserStyleSheetsFromWorld(DOMWrapperWorld& world)
</span><span class="cx"> {
</span><del>- if (!m_userStyleSheets)
- return;
-
- if (!m_userStyleSheets->remove(&world))
- return;
-
- invalidateInjectedStyleSheetCacheInAllFrames();
</del><ins>+ m_userContentController->removeUserStyleSheets(world);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageGroup::removeAllUserContent()
</span><span class="cx"> {
</span><span class="cx"> m_userContentController->removeAllUserContent();
</span><del>-
- if (m_userStyleSheets) {
- m_userStyleSheets = nullptr;
- invalidateInjectedStyleSheetCacheInAllFrames();
- }
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void PageGroup::invalidateInjectedStyleSheetCacheInAllFrames()
-{
- // Clear our cached sheets and have them just reparse.
- for (auto it = m_pages.begin(), end = m_pages.end(); it != end; ++it) {
- for (Frame* frame = &(*it)->mainFrame(); frame; frame = frame->tree().traverseNext()) {
- frame->document()->styleSheetCollection().invalidateInjectedStyleSheetCache();
- frame->document()->styleResolverChanged(DeferRecalcStyle);
- }
- }
-}
-
</del><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> void PageGroup::captionPreferencesChanged()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageGroup.h (162394 => 162395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageGroup.h 2014-01-21 01:31:37 UTC (rev 162394)
+++ trunk/Source/WebCore/page/PageGroup.h 2014-01-21 01:51:03 UTC (rev 162395)
</span><span class="lines">@@ -100,8 +100,6 @@
</span><span class="cx"> void removeUserStyleSheetsFromWorld(DOMWrapperWorld&);
</span><span class="cx"> void removeAllUserContent();
</span><span class="cx">
</span><del>- const UserStyleSheetMap* userStyleSheets() const { return m_userStyleSheets.get(); }
-
</del><span class="cx"> GroupSettings& groupSettings() const { return *m_groupSettings; }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="lines">@@ -111,7 +109,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void addVisitedLink(LinkHash);
</span><del>- void invalidateInjectedStyleSheetCacheInAllFrames();
</del><span class="cx">
</span><span class="cx"> String m_name;
</span><span class="cx"> HashSet<Page*> m_pages;
</span><span class="lines">@@ -124,7 +121,6 @@
</span><span class="cx"> HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageNamespace>> m_transientLocalStorageMap;
</span><span class="cx">
</span><span class="cx"> RefPtr<UserContentController> m_userContentController;
</span><del>- std::unique_ptr<UserStyleSheetMap> m_userStyleSheets;
</del><span class="cx">
</span><span class="cx"> const std::unique_ptr<GroupSettings> m_groupSettings;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageUserContentControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/UserContentController.cpp (162394 => 162395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/UserContentController.cpp 2014-01-21 01:31:37 UTC (rev 162394)
+++ trunk/Source/WebCore/page/UserContentController.cpp 2014-01-21 01:51:03 UTC (rev 162395)
</span><span class="lines">@@ -27,7 +27,11 @@
</span><span class="cx"> #include "UserContentController.h"
</span><span class="cx">
</span><span class="cx"> #include "DOMWrapperWorld.h"
</span><ins>+#include "Document.h"
+#include "MainFrame.h"
+#include "Page.h"
</ins><span class="cx"> #include "UserScript.h"
</span><ins>+#include "UserStyleSheet.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -94,9 +98,77 @@
</span><span class="cx"> m_userScripts->remove(&world);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UserContentController::addUserStyleSheet(DOMWrapperWorld& world, std::unique_ptr<UserStyleSheet> userStyleSheet, UserStyleInjectionTime injectionTime)
+{
+ if (!m_userStyleSheets)
+ m_userStyleSheets = std::make_unique<UserStyleSheetMap>();
+
+ auto& styleSheetsInWorld = m_userStyleSheets->add(&world, nullptr).iterator->value;
+ if (!styleSheetsInWorld)
+ styleSheetsInWorld = std::make_unique<UserStyleSheetVector>();
+ styleSheetsInWorld->append(std::move(userStyleSheet));
+
+ if (injectionTime == InjectInExistingDocuments)
+ invalidateInjectedStyleSheetCacheInAllFrames();
+}
+
+void UserContentController::removeUserStyleSheet(DOMWrapperWorld& world, const URL& url)
+{
+ if (!m_userStyleSheets)
+ return;
+
+ auto it = m_userStyleSheets->find(&world);
+ if (it == m_userStyleSheets->end())
+ return;
+
+ auto& stylesheets = *it->value;
+
+ bool sheetsChanged = false;
+ for (int i = stylesheets.size() - 1; i >= 0; --i) {
+ if (stylesheets[i]->url() == url) {
+ stylesheets.remove(i);
+ sheetsChanged = true;
+ }
+ }
+
+ if (!sheetsChanged)
+ return;
+
+ if (stylesheets.isEmpty())
+ m_userStyleSheets->remove(it);
+
+ invalidateInjectedStyleSheetCacheInAllFrames();
+}
+
+void UserContentController::removeUserStyleSheets(DOMWrapperWorld& world)
+{
+ if (!m_userStyleSheets)
+ return;
+
+ if (!m_userStyleSheets->remove(&world))
+ return;
+
+ invalidateInjectedStyleSheetCacheInAllFrames();
+}
+
</ins><span class="cx"> void UserContentController::removeAllUserContent()
</span><span class="cx"> {
</span><span class="cx"> m_userScripts = nullptr;
</span><ins>+
+ if (m_userStyleSheets) {
+ m_userStyleSheets = nullptr;
+ invalidateInjectedStyleSheetCacheInAllFrames();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void UserContentController::invalidateInjectedStyleSheetCacheInAllFrames()
+{
+ for (auto& page : m_pages) {
+ for (Frame* frame = &page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
+ frame->document()->styleSheetCollection().invalidateInjectedStyleSheetCache();
+ frame->document()->styleResolverChanged(DeferRecalcStyle);
+ }
+ }
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageUserContentControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/UserContentController.h (162394 => 162395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/UserContentController.h 2014-01-21 01:31:37 UTC (rev 162394)
+++ trunk/Source/WebCore/page/UserContentController.h 2014-01-21 01:51:03 UTC (rev 162395)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define UserContentController_h
</span><span class="cx">
</span><span class="cx"> #include "UserScriptTypes.h"
</span><ins>+#include "UserStyleSheetTypes.h"
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -37,6 +38,7 @@
</span><span class="cx"> class Page;
</span><span class="cx"> class URL;
</span><span class="cx"> class UserScript;
</span><ins>+class UserStyleSheet;
</ins><span class="cx">
</span><span class="cx"> class UserContentController : public RefCounted<UserContentController> {
</span><span class="cx"> public:
</span><span class="lines">@@ -52,14 +54,23 @@
</span><span class="cx"> void removeUserScript(DOMWrapperWorld&, const URL&);
</span><span class="cx"> void removeUserScripts(DOMWrapperWorld&);
</span><span class="cx">
</span><ins>+ const UserStyleSheetMap* userStyleSheets() const { return m_userStyleSheets.get(); }
+
+ void addUserStyleSheet(DOMWrapperWorld&, std::unique_ptr<UserStyleSheet>, UserStyleInjectionTime);
+ void removeUserStyleSheet(DOMWrapperWorld&, const URL&);
+ void removeUserStyleSheets(DOMWrapperWorld&);
+
</ins><span class="cx"> void removeAllUserContent();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> UserContentController();
</span><span class="cx">
</span><ins>+ void invalidateInjectedStyleSheetCacheInAllFrames();
+
</ins><span class="cx"> HashSet<Page*> m_pages;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<UserScriptMap> m_userScripts;
</span><ins>+ std::unique_ptr<UserStyleSheetMap> m_userStyleSheets;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>