<!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>[197831] 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/197831">197831</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2016-03-08 20:39:49 -0800 (Tue, 08 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using the UserContentController for injecting the override style sheet from CaptionUserPreferences
https://bugs.webkit.org/show_bug.cgi?id=155211
Reviewed by Dan Bernstein.
The UserContentController is going to become read only from WebCore's perspective. The CaptionUserPreferences
was relying on being able to set a UserStyleSheet on it, but this was really unnecessary complexity. Simplify
things by storing the style sheet's source directly on the Page and teaching ExtensionStyleSheets about it
explicitly.
* dom/ExtensionStyleSheets.cpp:
(WebCore::ExtensionStyleSheets::updateInjectedStyleSheetCache):
If there is a captionUserPreferencesStyleSheet on the page, inject it.
* page/CaptionUserPreferences.cpp:
(WebCore::CaptionUserPreferences::updateCaptionStyleSheetOveride):
Greatly simplify the code. Now, all this does is set the style sheet on each page.
* page/Page.cpp:
(WebCore::Page::invalidateInjectedStyleSheetCacheInAllFrames):
Extract this out from UserContentController.
(WebCore::Page::setUserContentController):
Call the newly extracted invalidateInjectedStyleSheetCacheInAllFrames().
(WebCore::Page::captionUserPreferencesStyleSheet):
(WebCore::Page::setCaptionUserPreferencesStyleSheet):
Add getter/setter. When setting, invalidate the style sheet cache.
* page/Page.h:
Add new members and functions.
* page/UserContentController.cpp:
(WebCore::UserContentController::addUserStyleSheet):
(WebCore::UserContentController::removeUserStyleSheet):
(WebCore::UserContentController::removeUserStyleSheets):
(WebCore::UserContentController::removeAllUserContent):
Switch to calling invalidateInjectedStyleSheetCacheInAllFramesInAllPages().
(WebCore::UserContentController::invalidateInjectedStyleSheetCacheInAllFramesInAllPages):
Rename and implement in terms of Page::invalidateInjectedStyleSheetCacheInAllFrames().
* page/UserContentController.h:
Rename function.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomExtensionStyleSheetscpp">trunk/Source/WebCore/dom/ExtensionStyleSheets.cpp</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencescpp">trunk/Source/WebCore/page/CaptionUserPreferences.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.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 (197830 => 197831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-09 02:50:22 UTC (rev 197830)
+++ trunk/Source/WebCore/ChangeLog 2016-03-09 04:39:49 UTC (rev 197831)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2016-03-08 Sam Weinig <sam@webkit.org>
+
+ Stop using the UserContentController for injecting the override style sheet from CaptionUserPreferences
+ https://bugs.webkit.org/show_bug.cgi?id=155211
+
+ Reviewed by Dan Bernstein.
+
+ The UserContentController is going to become read only from WebCore's perspective. The CaptionUserPreferences
+ was relying on being able to set a UserStyleSheet on it, but this was really unnecessary complexity. Simplify
+ things by storing the style sheet's source directly on the Page and teaching ExtensionStyleSheets about it
+ explicitly.
+
+ * dom/ExtensionStyleSheets.cpp:
+ (WebCore::ExtensionStyleSheets::updateInjectedStyleSheetCache):
+ If there is a captionUserPreferencesStyleSheet on the page, inject it.
+
+ * page/CaptionUserPreferences.cpp:
+ (WebCore::CaptionUserPreferences::updateCaptionStyleSheetOveride):
+ Greatly simplify the code. Now, all this does is set the style sheet on each page.
+
+ * page/Page.cpp:
+ (WebCore::Page::invalidateInjectedStyleSheetCacheInAllFrames):
+ Extract this out from UserContentController.
+
+ (WebCore::Page::setUserContentController):
+ Call the newly extracted invalidateInjectedStyleSheetCacheInAllFrames().
+
+ (WebCore::Page::captionUserPreferencesStyleSheet):
+ (WebCore::Page::setCaptionUserPreferencesStyleSheet):
+ Add getter/setter. When setting, invalidate the style sheet cache.
+
+ * page/Page.h:
+ Add new members and functions.
+
+ * page/UserContentController.cpp:
+ (WebCore::UserContentController::addUserStyleSheet):
+ (WebCore::UserContentController::removeUserStyleSheet):
+ (WebCore::UserContentController::removeUserStyleSheets):
+ (WebCore::UserContentController::removeAllUserContent):
+ Switch to calling invalidateInjectedStyleSheetCacheInAllFramesInAllPages().
+
+ (WebCore::UserContentController::invalidateInjectedStyleSheetCacheInAllFramesInAllPages):
+ Rename and implement in terms of Page::invalidateInjectedStyleSheetCacheInAllFrames().
+
+ * page/UserContentController.h:
+ Rename function.
+
</ins><span class="cx"> 2016-03-08 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Memory Timeline should show MemoryPressure events
</span></span></pre></div>
<a id="trunkSourceWebCoredomExtensionStyleSheetscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ExtensionStyleSheets.cpp (197830 => 197831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ExtensionStyleSheets.cpp 2016-03-09 02:50:22 UTC (rev 197830)
+++ trunk/Source/WebCore/dom/ExtensionStyleSheets.cpp 2016-03-09 04:39:49 UTC (rev 197831)
</span><span class="lines">@@ -117,6 +117,17 @@
</span><span class="cx"> if (!owningPage)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (!owningPage->captionUserPreferencesStyleSheet().isEmpty()) {
+ // Identify our override style sheet with a unique URL - a new scheme and a UUID.
+ static NeverDestroyed<URL> captionsStyleSheetURL(ParsedURLString, "user-captions-override:01F6AF12-C3B0-4F70-AF5E-A3E00234DC23");
+
+ RefPtr<CSSStyleSheet> sheet = CSSStyleSheet::createInline(const_cast<Document&>(m_document), captionsStyleSheetURL.get());
+ m_injectedAuthorStyleSheets.append(sheet);
+
+ sheet->contents().setIsUserStyleSheet(false);
+ sheet->contents().parseString(owningPage->captionUserPreferencesStyleSheet());
+ }
+
</ins><span class="cx"> const auto* userContentController = owningPage->userContentController();
</span><span class="cx"> if (!userContentController)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferences.cpp (197830 => 197831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferences.cpp 2016-03-09 02:50:22 UTC (rev 197830)
+++ trunk/Source/WebCore/page/CaptionUserPreferences.cpp 2016-03-09 04:39:49 UTC (rev 197831)
</span><span class="lines">@@ -298,25 +298,9 @@
</span><span class="cx">
</span><span class="cx"> void CaptionUserPreferences::updateCaptionStyleSheetOveride()
</span><span class="cx"> {
</span><del>- // Identify our override style sheet with a unique URL - a new scheme and a UUID.
- static NeverDestroyed<URL> captionsStyleSheetURL(ParsedURLString, "user-captions-override:01F6AF12-C3B0-4F70-AF5E-A3E00234DC23");
-
- auto& pages = m_pageGroup.pages();
- for (auto& page : pages) {
- if (auto* pageUserContentController = page->userContentController())
- pageUserContentController->removeUserStyleSheet(mainThreadNormalWorld(), captionsStyleSheetURL);
- }
-
</del><span class="cx"> String captionsOverrideStyleSheet = captionsStyleSheetOverride();
</span><del>- if (captionsOverrideStyleSheet.isEmpty())
- return;
-
- for (auto& page : pages) {
- if (auto* pageUserContentController = page->userContentController()) {
- auto userStyleSheet = std::make_unique<UserStyleSheet>(captionsOverrideStyleSheet, captionsStyleSheetURL, Vector<String>(), Vector<String>(), InjectInAllFrames, UserStyleAuthorLevel);
- pageUserContentController->addUserStyleSheet(mainThreadNormalWorld(), WTFMove(userStyleSheet), InjectInExistingDocuments);
- }
- }
</del><ins>+ for (auto& page : m_pageGroup.pages())
+ page->setCaptionUserPreferencesStyleSheet(captionsOverrideStyleSheet);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String CaptionUserPreferences::primaryAudioTrackLanguageOverride() const
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (197830 => 197831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2016-03-09 02:50:22 UTC (rev 197830)
+++ trunk/Source/WebCore/page/Page.cpp 2016-03-09 04:39:49 UTC (rev 197831)
</span><span class="lines">@@ -1126,6 +1126,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Page::invalidateInjectedStyleSheetCacheInAllFrames()
+{
+ for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) {
+ Document* document = frame->document();
+ if (!document)
+ continue;
+ document->extensionStyleSheets().invalidateInjectedStyleSheetCache();
+ document->styleResolverChanged(DeferRecalcStyle);
+ }
+}
+
</ins><span class="cx"> void Page::setDebugger(JSC::Debugger* debugger)
</span><span class="cx"> {
</span><span class="cx"> if (m_debugger == debugger)
</span><span class="lines">@@ -1818,12 +1829,7 @@
</span><span class="cx"> if (m_userContentController)
</span><span class="cx"> m_userContentController->addPage(*this);
</span><span class="cx">
</span><del>- for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
- if (Document *document = frame->document()) {
- document->extensionStyleSheets().invalidateInjectedStyleSheetCache();
- document->styleResolverChanged(DeferRecalcStyle);
- }
- }
</del><ins>+ invalidateInjectedStyleSheetCacheInAllFrames();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::setStorageNamespaceProvider(Ref<StorageNamespaceProvider>&& storageNamespaceProvider)
</span><span class="lines">@@ -2008,4 +2014,19 @@
</span><span class="cx"> return m_sessionID.isAlwaysOnLoggingAllowed();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String Page::captionUserPreferencesStyleSheet()
+{
+ return m_captionUserPreferencesStyleSheet;
+}
+
+void Page::setCaptionUserPreferencesStyleSheet(const String& styleSheet)
+{
+ if (m_captionUserPreferencesStyleSheet == styleSheet)
+ return;
+
+ m_captionUserPreferencesStyleSheet = styleSheet;
+
+ invalidateInjectedStyleSheetCacheInAllFrames();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (197830 => 197831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2016-03-09 02:50:22 UTC (rev 197830)
+++ trunk/Source/WebCore/page/Page.h 2016-03-09 04:39:49 UTC (rev 197831)
</span><span class="lines">@@ -357,6 +357,8 @@
</span><span class="cx"> WEBCORE_EXPORT void invalidateStylesForAllLinks();
</span><span class="cx"> WEBCORE_EXPORT void invalidateStylesForLink(LinkHash);
</span><span class="cx">
</span><ins>+ void invalidateInjectedStyleSheetCacheInAllFrames();
+
</ins><span class="cx"> StorageNamespace* sessionStorage(bool optionalCreate = true);
</span><span class="cx"> void setSessionStorage(RefPtr<StorageNamespace>&&);
</span><span class="cx">
</span><span class="lines">@@ -509,6 +511,9 @@
</span><span class="cx">
</span><span class="cx"> bool isAlwaysOnLoggingAllowed() const;
</span><span class="cx">
</span><ins>+ String captionUserPreferencesStyleSheet();
+ void setCaptionUserPreferencesStyleSheet(const String&);
+
</ins><span class="cx"> private:
</span><span class="cx"> WEBCORE_EXPORT void initGroup();
</span><span class="cx">
</span><span class="lines">@@ -609,6 +614,8 @@
</span><span class="cx"> mutable bool m_didLoadUserStyleSheet;
</span><span class="cx"> mutable time_t m_userStyleSheetModificationTime;
</span><span class="cx">
</span><ins>+ String m_captionUserPreferencesStyleSheet;
+
</ins><span class="cx"> std::unique_ptr<PageGroup> m_singlePageGroup;
</span><span class="cx"> PageGroup* m_group;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageUserContentControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/UserContentController.cpp (197830 => 197831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/UserContentController.cpp 2016-03-09 02:50:22 UTC (rev 197830)
+++ trunk/Source/WebCore/page/UserContentController.cpp 2016-03-09 04:39:49 UTC (rev 197831)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> styleSheetsInWorld->append(WTFMove(userStyleSheet));
</span><span class="cx">
</span><span class="cx"> if (injectionTime == InjectInExistingDocuments)
</span><del>- invalidateInjectedStyleSheetCacheInAllFrames();
</del><ins>+ invalidateInjectedStyleSheetCacheInAllFramesInAllPages();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UserContentController::removeUserStyleSheet(DOMWrapperWorld& world, const URL& url)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> if (stylesheets.isEmpty())
</span><span class="cx"> m_userStyleSheets->remove(it);
</span><span class="cx">
</span><del>- invalidateInjectedStyleSheetCacheInAllFrames();
</del><ins>+ invalidateInjectedStyleSheetCacheInAllFramesInAllPages();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UserContentController::removeUserStyleSheets(DOMWrapperWorld& world)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> if (!m_userStyleSheets->remove(&world))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- invalidateInjectedStyleSheetCacheInAllFrames();
</del><ins>+ invalidateInjectedStyleSheetCacheInAllFramesInAllPages();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(USER_MESSAGE_HANDLERS)
</span><span class="lines">@@ -249,18 +249,14 @@
</span><span class="cx">
</span><span class="cx"> if (m_userStyleSheets) {
</span><span class="cx"> m_userStyleSheets = nullptr;
</span><del>- invalidateInjectedStyleSheetCacheInAllFrames();
</del><ins>+ invalidateInjectedStyleSheetCacheInAllFramesInAllPages();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UserContentController::invalidateInjectedStyleSheetCacheInAllFrames()
</del><ins>+void UserContentController::invalidateInjectedStyleSheetCacheInAllFramesInAllPages()
</ins><span class="cx"> {
</span><del>- for (auto& page : m_pages) {
- for (Frame* frame = &page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
- frame->document()->extensionStyleSheets().invalidateInjectedStyleSheetCache();
- frame->document()->styleResolverChanged(DeferRecalcStyle);
- }
- }
</del><ins>+ for (auto& page : m_pages)
+ page->invalidateInjectedStyleSheetCacheInAllFrames();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageUserContentControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/UserContentController.h (197830 => 197831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/UserContentController.h 2016-03-09 02:50:22 UTC (rev 197830)
+++ trunk/Source/WebCore/page/UserContentController.h 2016-03-09 04:39:49 UTC (rev 197831)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> private:
</span><span class="cx"> UserContentController();
</span><span class="cx">
</span><del>- void invalidateInjectedStyleSheetCacheInAllFrames();
</del><ins>+ void invalidateInjectedStyleSheetCacheInAllFramesInAllPages();
</ins><span class="cx">
</span><span class="cx"> HashSet<Page*> m_pages;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>