<!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>[190169] 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/190169">190169</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-09-23 08:04:16 -0700 (Wed, 23 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Split author style code out from DocumentStyleSheetCollection
https://bugs.webkit.org/show_bug.cgi?id=149446
Reviewed by Andreas Kling.
Shadow trees may have their own author style. Factor the related code out so we can use
it outside the document context.
DocumentStyleSheetCollection is replaced by two classes:
AuthorStyleSheets - author stylesheets and mutation optimization code
ExtensionStyleSheets - user stylesheets, injected author stylesheets, content extension stylesheets
* WebCore.xcodeproj/project.pbxproj:
* contentextensions/ContentExtensionsBackend.cpp:
(WebCore::ContentExtensions::ContentExtensionsBackend::processContentExtensionRulesForLoad):
* css/CSSStyleSheet.cpp:
(WebCore::CSSStyleSheet::didMutateRules):
* css/DocumentRuleSets.cpp:
(WebCore::DocumentRuleSets::~DocumentRuleSets):
(WebCore::DocumentRuleSets::initUserStyle):
* css/DocumentRuleSets.h:
(WebCore::DocumentRuleSets::sibling):
(WebCore::DocumentRuleSets::uncommonAttribute):
* css/InspectorCSSOMWrappers.cpp:
(WebCore::InspectorCSSOMWrappers::collectFromStyleSheets):
(WebCore::InspectorCSSOMWrappers::getWrapperForRuleInSheets):
(WebCore::InspectorCSSOMWrappers::collectFromDocumentStyleSheetCollection): Deleted.
* css/InspectorCSSOMWrappers.h:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::StyleResolver):
(WebCore::StyleResolver::appendAuthorStyleSheets):
* css/StyleSheetList.cpp:
(WebCore::StyleSheetList::styleSheets):
(WebCore::StyleSheetList::detachFromDocument):
(WebCore::StyleSheetList::length):
* dom/AuthorStyleSheets.cpp: Added.
(WebCore::AuthorStyleSheets::AuthorStyleSheets):
(WebCore::AuthorStyleSheets::combineCSSFeatureFlags):
(WebCore::AuthorStyleSheets::resetCSSFeatureFlags):
(WebCore::AuthorStyleSheets::addAuthorSheet):
(WebCore::AuthorStyleSheets::removePendingSheet):
(WebCore::AuthorStyleSheets::addStyleSheetCandidateNode):
(WebCore::AuthorStyleSheets::removeStyleSheetCandidateNode):
(WebCore::AuthorStyleSheets::collectActiveStyleSheets):
(WebCore::AuthorStyleSheets::analyzeStyleSheetChange):
(WebCore::filterEnabledNonemptyCSSStyleSheets):
(WebCore::AuthorStyleSheets::updateActiveStyleSheets):
(WebCore::AuthorStyleSheets::activeStyleSheetsForInspector):
(WebCore::AuthorStyleSheets::activeStyleSheetsContains):
(WebCore::AuthorStyleSheets::detachFromDocument):
* dom/AuthorStyleSheets.h: Added.
(WebCore::AuthorStyleSheets::activeStyleSheets):
(WebCore::AuthorStyleSheets::styleSheets):
(WebCore::AuthorStyleSheets::styleSheetsForStyleSheetList):
(WebCore::AuthorStyleSheets::pendingUpdateType):
(WebCore::AuthorStyleSheets::setPendingUpdateType):
(WebCore::AuthorStyleSheets::flushPendingUpdates):
(WebCore::AuthorStyleSheets::preferredStylesheetSetName):
(WebCore::AuthorStyleSheets::selectedStylesheetSetName):
(WebCore::AuthorStyleSheets::setPreferredStylesheetSetName):
(WebCore::AuthorStyleSheets::setSelectedStylesheetSetName):
(WebCore::AuthorStyleSheets::addPendingSheet):
(WebCore::AuthorStyleSheets::hasPendingSheets):
(WebCore::AuthorStyleSheets::usesFirstLineRules):
(WebCore::AuthorStyleSheets::usesFirstLetterRules):
(WebCore::AuthorStyleSheets::usesRemUnits):
(WebCore::AuthorStyleSheets::setUsesRemUnit):
(WebCore::AuthorStyleSheets::usesStyleBasedEditability):
(WebCore::AuthorStyleSheets::setUsesStyleBasedEditability):
* dom/Document.cpp:
(WebCore::Document::Document):
(WebCore::Document::~Document):
(WebCore::Document::setCompatibilityMode):
(WebCore::Document::recalcStyle):
(WebCore::Document::createStyleResolver):
(WebCore::Document::fontsNeedUpdate):
(WebCore::Document::usesStyleBasedEditability):
(WebCore::Document::processHttpEquiv):
(WebCore::Document::preferredStylesheetSet):
(WebCore::Document::selectedStylesheetSet):
(WebCore::Document::setSelectedStylesheetSet):
(WebCore::Document::scheduleOptimizedStyleSheetUpdate):
(WebCore::Document::styleResolverChanged):
(WebCore::Document::haveStylesheetsLoaded):
(WebCore::Document::getCachedLocale):
* dom/Document.h:
(WebCore::Document::authorStyleSheets):
(WebCore::Document::extensionStyleSheets):
(WebCore::Document::gotoAnchorNeededAfterStylesheetsLoad):
(WebCore::Document::setGotoAnchorNeededAfterStylesheetsLoad):
(WebCore::Document::styleSheetCollection): Deleted.
* dom/DocumentStyleSheetCollection.cpp: Removed.
* dom/DocumentStyleSheetCollection.h: Removed.
* dom/ExtensionStyleSheets.cpp: Copied from Source/WebCore/dom/DocumentStyleSheetCollection.cpp.
(WebCore::ExtensionStyleSheets::ExtensionStyleSheets):
(WebCore::ExtensionStyleSheets::pageUserSheet):
(WebCore::ExtensionStyleSheets::clearPageUserSheet):
(WebCore::ExtensionStyleSheets::updatePageUserSheet):
(WebCore::ExtensionStyleSheets::injectedUserStyleSheets):
(WebCore::ExtensionStyleSheets::injectedAuthorStyleSheets):
(WebCore::ExtensionStyleSheets::updateInjectedStyleSheetCache):
(WebCore::ExtensionStyleSheets::invalidateInjectedStyleSheetCache):
(WebCore::ExtensionStyleSheets::addUserSheet):
(WebCore::ExtensionStyleSheets::addDisplayNoneSelector):
(WebCore::ExtensionStyleSheets::maybeAddContentExtensionSheet):
(WebCore::ExtensionStyleSheets::styleResolverChangedTimerFired):
(WebCore::ExtensionStyleSheets::detachFromDocument):
(WebCore::DocumentStyleSheetCollection::DocumentStyleSheetCollection): Deleted.
(WebCore::DocumentStyleSheetCollection::combineCSSFeatureFlags): Deleted.
(WebCore::DocumentStyleSheetCollection::resetCSSFeatureFlags): Deleted.
(WebCore::DocumentStyleSheetCollection::pageUserSheet): Deleted.
(WebCore::DocumentStyleSheetCollection::clearPageUserSheet): Deleted.
(WebCore::DocumentStyleSheetCollection::updatePageUserSheet): Deleted.
(WebCore::DocumentStyleSheetCollection::injectedUserStyleSheets): Deleted.
(WebCore::DocumentStyleSheetCollection::injectedAuthorStyleSheets): Deleted.
(WebCore::DocumentStyleSheetCollection::updateInjectedStyleSheetCache): Deleted.
(WebCore::DocumentStyleSheetCollection::invalidateInjectedStyleSheetCache): Deleted.
(WebCore::DocumentStyleSheetCollection::addAuthorSheet): Deleted.
(WebCore::DocumentStyleSheetCollection::addUserSheet): Deleted.
(WebCore::DocumentStyleSheetCollection::addDisplayNoneSelector): Deleted.
(WebCore::DocumentStyleSheetCollection::maybeAddContentExtensionSheet): Deleted.
(WebCore::DocumentStyleSheetCollection::styleResolverChangedTimerFired): Deleted.
(WebCore::DocumentStyleSheetCollection::removePendingSheet): Deleted.
(WebCore::DocumentStyleSheetCollection::addStyleSheetCandidateNode): Deleted.
(WebCore::DocumentStyleSheetCollection::removeStyleSheetCandidateNode): Deleted.
(WebCore::DocumentStyleSheetCollection::collectActiveStyleSheets): Deleted.
(WebCore::DocumentStyleSheetCollection::analyzeStyleSheetChange): Deleted.
(WebCore::filterEnabledNonemptyCSSStyleSheets): Deleted.
(WebCore::DocumentStyleSheetCollection::updateActiveStyleSheets): Deleted.
(WebCore::DocumentStyleSheetCollection::activeStyleSheetsForInspector): Deleted.
(WebCore::DocumentStyleSheetCollection::activeStyleSheetsContains): Deleted.
(WebCore::DocumentStyleSheetCollection::detachFromDocument): Deleted.
* dom/ExtensionStyleSheets.h: Copied from Source/WebCore/dom/DocumentStyleSheetCollection.h.
(WebCore::ExtensionStyleSheets::documentUserStyleSheets):
(WebCore::DocumentStyleSheetCollection::styleSheetsForStyleSheetList): Deleted.
(WebCore::DocumentStyleSheetCollection::activeAuthorStyleSheets): Deleted.
(WebCore::DocumentStyleSheetCollection::documentUserStyleSheets): Deleted.
(WebCore::DocumentStyleSheetCollection::documentAuthorStyleSheets): Deleted.
(WebCore::DocumentStyleSheetCollection::pendingUpdateType): Deleted.
(WebCore::DocumentStyleSheetCollection::setPendingUpdateType): Deleted.
(WebCore::DocumentStyleSheetCollection::flushPendingUpdates): Deleted.
(WebCore::DocumentStyleSheetCollection::preferredStylesheetSetName): Deleted.
(WebCore::DocumentStyleSheetCollection::selectedStylesheetSetName): Deleted.
(WebCore::DocumentStyleSheetCollection::setPreferredStylesheetSetName): Deleted.
(WebCore::DocumentStyleSheetCollection::setSelectedStylesheetSetName): Deleted.
(WebCore::DocumentStyleSheetCollection::addPendingSheet): Deleted.
(WebCore::DocumentStyleSheetCollection::hasPendingSheets): Deleted.
(WebCore::DocumentStyleSheetCollection::usesFirstLineRules): Deleted.
(WebCore::DocumentStyleSheetCollection::usesFirstLetterRules): Deleted.
(WebCore::DocumentStyleSheetCollection::usesRemUnits): Deleted.
(WebCore::DocumentStyleSheetCollection::setUsesRemUnit): Deleted.
(WebCore::DocumentStyleSheetCollection::usesStyleBasedEditability): Deleted.
(WebCore::DocumentStyleSheetCollection::setUsesStyleBasedEditability): Deleted.
* dom/InlineStyleSheetOwner.cpp:
(WebCore::InlineStyleSheetOwner::insertedIntoDocument):
(WebCore::InlineStyleSheetOwner::removedFromDocument):
(WebCore::InlineStyleSheetOwner::clearDocumentData):
(WebCore::InlineStyleSheetOwner::childrenChanged):
(WebCore::InlineStyleSheetOwner::createSheet):
(WebCore::InlineStyleSheetOwner::sheetLoaded):
(WebCore::InlineStyleSheetOwner::startLoadingDynamicSheet):
* dom/ProcessingInstruction.cpp:
(WebCore::ProcessingInstruction::~ProcessingInstruction):
(WebCore::ProcessingInstruction::nodeName):
(WebCore::ProcessingInstruction::checkStyleSheet):
(WebCore::ProcessingInstruction::sheetLoaded):
(WebCore::ProcessingInstruction::insertedInto):
(WebCore::ProcessingInstruction::removedFrom):
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::~HTMLLinkElement):
(WebCore::HTMLLinkElement::insertedInto):
(WebCore::HTMLLinkElement::removedFrom):
(WebCore::HTMLLinkElement::addPendingSheet):
(WebCore::HTMLLinkElement::removePendingSheet):
* html/HTMLQuoteElement.cpp:
* inspector/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::collectAllDocumentStyleSheets):
(WebCore::InspectorCSSAgent::buildObjectForRule):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::commitData):
* page/Page.cpp:
(WebCore::Page::userStyleSheetLocationChanged):
(WebCore::Page::setUserContentController):
* page/PageGroup.cpp:
* page/UserContentController.cpp:
(WebCore::UserContentController::invalidateInjectedStyleSheetCacheInAllFrames):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::lineHeight):
(WebCore::RenderBlock::getFirstLetter):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::uncachedFirstLineStyle):
(WebCore::RenderElement::cachedFirstLineStyle):
* rendering/RenderElement.h:
(WebCore::RenderElement::firstLineStyle):
(WebCore::RenderElement::setAncestorLineBoxDirty):
* rendering/RenderInline.cpp:
(WebCore::RenderInline::updateAlwaysCreateLineBoxes):
(WebCore::RenderInline::lineHeight):
* rendering/RenderLineBreak.cpp:
(WebCore::RenderLineBreak::lineHeight):
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::verticalPositionForBox):
* style/StyleResolveTree.cpp:
(WebCore::Style::resolveLocal):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionsBackendcpp">trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleSheetcpp">trunk/Source/WebCore/css/CSSStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssDocumentRuleSetscpp">trunk/Source/WebCore/css/DocumentRuleSets.cpp</a></li>
<li><a href="#trunkSourceWebCorecssDocumentRuleSetsh">trunk/Source/WebCore/css/DocumentRuleSets.h</a></li>
<li><a href="#trunkSourceWebCorecssInspectorCSSOMWrapperscpp">trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp</a></li>
<li><a href="#trunkSourceWebCorecssInspectorCSSOMWrappersh">trunk/Source/WebCore/css/InspectorCSSOMWrappers.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleSheetListcpp">trunk/Source/WebCore/css/StyleSheetList.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDOMAllInOnecpp">trunk/Source/WebCore/dom/DOMAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomInlineStyleSheetOwnercpp">trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp</a></li>
<li><a href="#trunkSourceWebCoredomProcessingInstructioncpp">trunk/Source/WebCore/dom/ProcessingInstruction.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLLinkElementcpp">trunk/Source/WebCore/html/HTMLLinkElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLQuoteElementcpp">trunk/Source/WebCore/html/HTMLQuoteElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgentcpp">trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageGroupcpp">trunk/Source/WebCore/page/PageGroup.cpp</a></li>
<li><a href="#trunkSourceWebCorepageUserContentControllercpp">trunk/Source/WebCore/page/UserContentController.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderInlinecpp">trunk/Source/WebCore/rendering/RenderInline.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLineBreakcpp">trunk/Source/WebCore/rendering/RenderLineBreak.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRootInlineBoxcpp">trunk/Source/WebCore/rendering/RootInlineBox.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoredomAuthorStyleSheetscpp">trunk/Source/WebCore/dom/AuthorStyleSheets.cpp</a></li>
<li><a href="#trunkSourceWebCoredomAuthorStyleSheetsh">trunk/Source/WebCore/dom/AuthorStyleSheets.h</a></li>
<li><a href="#trunkSourceWebCoredomExtensionStyleSheetscpp">trunk/Source/WebCore/dom/ExtensionStyleSheets.cpp</a></li>
<li><a href="#trunkSourceWebCoredomExtensionStyleSheetsh">trunk/Source/WebCore/dom/ExtensionStyleSheets.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoredomDocumentStyleSheetCollectioncpp">trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentStyleSheetCollectionh">trunk/Source/WebCore/dom/DocumentStyleSheetCollection.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -1377,6 +1377,7 @@
</span><span class="cx"> dom/ActiveDOMObject.cpp
</span><span class="cx"> dom/AnimationEvent.cpp
</span><span class="cx"> dom/Attr.cpp
</span><ins>+ dom/AuthorStyleSheets.cpp
</ins><span class="cx"> dom/BeforeTextInsertedEvent.cpp
</span><span class="cx"> dom/BeforeUnloadEvent.cpp
</span><span class="cx"> dom/CDATASection.cpp
</span><span class="lines">@@ -1418,7 +1419,6 @@
</span><span class="cx"> dom/DocumentOrderedMap.cpp
</span><span class="cx"> dom/DocumentParser.cpp
</span><span class="cx"> dom/DocumentSharedObjectPool.cpp
</span><del>- dom/DocumentStyleSheetCollection.cpp
</del><span class="cx"> dom/DocumentType.cpp
</span><span class="cx"> dom/Element.cpp
</span><span class="cx"> dom/ElementData.cpp
</span><span class="lines">@@ -1434,6 +1434,7 @@
</span><span class="cx"> dom/EventTarget.cpp
</span><span class="cx"> dom/ExceptionBase.cpp
</span><span class="cx"> dom/ExceptionCodePlaceholder.cpp
</span><ins>+ dom/ExtensionStyleSheets.cpp
</ins><span class="cx"> dom/FocusEvent.cpp
</span><span class="cx"> dom/GenericEventQueue.cpp
</span><span class="cx"> dom/IdTargetObserver.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/ChangeLog 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -1,3 +1,211 @@
</span><ins>+2015-09-22 Antti Koivisto <antti@apple.com>
+
+ Split author style code out from DocumentStyleSheetCollection
+ https://bugs.webkit.org/show_bug.cgi?id=149446
+
+ Reviewed by Andreas Kling.
+
+ Shadow trees may have their own author style. Factor the related code out so we can use
+ it outside the document context.
+
+ DocumentStyleSheetCollection is replaced by two classes:
+
+ AuthorStyleSheets - author stylesheets and mutation optimization code
+ ExtensionStyleSheets - user stylesheets, injected author stylesheets, content extension stylesheets
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * contentextensions/ContentExtensionsBackend.cpp:
+ (WebCore::ContentExtensions::ContentExtensionsBackend::processContentExtensionRulesForLoad):
+ * css/CSSStyleSheet.cpp:
+ (WebCore::CSSStyleSheet::didMutateRules):
+ * css/DocumentRuleSets.cpp:
+ (WebCore::DocumentRuleSets::~DocumentRuleSets):
+ (WebCore::DocumentRuleSets::initUserStyle):
+ * css/DocumentRuleSets.h:
+ (WebCore::DocumentRuleSets::sibling):
+ (WebCore::DocumentRuleSets::uncommonAttribute):
+ * css/InspectorCSSOMWrappers.cpp:
+ (WebCore::InspectorCSSOMWrappers::collectFromStyleSheets):
+ (WebCore::InspectorCSSOMWrappers::getWrapperForRuleInSheets):
+ (WebCore::InspectorCSSOMWrappers::collectFromDocumentStyleSheetCollection): Deleted.
+ * css/InspectorCSSOMWrappers.h:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::StyleResolver):
+ (WebCore::StyleResolver::appendAuthorStyleSheets):
+ * css/StyleSheetList.cpp:
+ (WebCore::StyleSheetList::styleSheets):
+ (WebCore::StyleSheetList::detachFromDocument):
+ (WebCore::StyleSheetList::length):
+ * dom/AuthorStyleSheets.cpp: Added.
+ (WebCore::AuthorStyleSheets::AuthorStyleSheets):
+ (WebCore::AuthorStyleSheets::combineCSSFeatureFlags):
+ (WebCore::AuthorStyleSheets::resetCSSFeatureFlags):
+ (WebCore::AuthorStyleSheets::addAuthorSheet):
+ (WebCore::AuthorStyleSheets::removePendingSheet):
+ (WebCore::AuthorStyleSheets::addStyleSheetCandidateNode):
+ (WebCore::AuthorStyleSheets::removeStyleSheetCandidateNode):
+ (WebCore::AuthorStyleSheets::collectActiveStyleSheets):
+ (WebCore::AuthorStyleSheets::analyzeStyleSheetChange):
+ (WebCore::filterEnabledNonemptyCSSStyleSheets):
+ (WebCore::AuthorStyleSheets::updateActiveStyleSheets):
+ (WebCore::AuthorStyleSheets::activeStyleSheetsForInspector):
+ (WebCore::AuthorStyleSheets::activeStyleSheetsContains):
+ (WebCore::AuthorStyleSheets::detachFromDocument):
+ * dom/AuthorStyleSheets.h: Added.
+ (WebCore::AuthorStyleSheets::activeStyleSheets):
+ (WebCore::AuthorStyleSheets::styleSheets):
+ (WebCore::AuthorStyleSheets::styleSheetsForStyleSheetList):
+ (WebCore::AuthorStyleSheets::pendingUpdateType):
+ (WebCore::AuthorStyleSheets::setPendingUpdateType):
+ (WebCore::AuthorStyleSheets::flushPendingUpdates):
+ (WebCore::AuthorStyleSheets::preferredStylesheetSetName):
+ (WebCore::AuthorStyleSheets::selectedStylesheetSetName):
+ (WebCore::AuthorStyleSheets::setPreferredStylesheetSetName):
+ (WebCore::AuthorStyleSheets::setSelectedStylesheetSetName):
+ (WebCore::AuthorStyleSheets::addPendingSheet):
+ (WebCore::AuthorStyleSheets::hasPendingSheets):
+ (WebCore::AuthorStyleSheets::usesFirstLineRules):
+ (WebCore::AuthorStyleSheets::usesFirstLetterRules):
+ (WebCore::AuthorStyleSheets::usesRemUnits):
+ (WebCore::AuthorStyleSheets::setUsesRemUnit):
+ (WebCore::AuthorStyleSheets::usesStyleBasedEditability):
+ (WebCore::AuthorStyleSheets::setUsesStyleBasedEditability):
+ * dom/Document.cpp:
+ (WebCore::Document::Document):
+ (WebCore::Document::~Document):
+ (WebCore::Document::setCompatibilityMode):
+ (WebCore::Document::recalcStyle):
+ (WebCore::Document::createStyleResolver):
+ (WebCore::Document::fontsNeedUpdate):
+ (WebCore::Document::usesStyleBasedEditability):
+ (WebCore::Document::processHttpEquiv):
+ (WebCore::Document::preferredStylesheetSet):
+ (WebCore::Document::selectedStylesheetSet):
+ (WebCore::Document::setSelectedStylesheetSet):
+ (WebCore::Document::scheduleOptimizedStyleSheetUpdate):
+ (WebCore::Document::styleResolverChanged):
+ (WebCore::Document::haveStylesheetsLoaded):
+ (WebCore::Document::getCachedLocale):
+ * dom/Document.h:
+ (WebCore::Document::authorStyleSheets):
+ (WebCore::Document::extensionStyleSheets):
+ (WebCore::Document::gotoAnchorNeededAfterStylesheetsLoad):
+ (WebCore::Document::setGotoAnchorNeededAfterStylesheetsLoad):
+ (WebCore::Document::styleSheetCollection): Deleted.
+ * dom/DocumentStyleSheetCollection.cpp: Removed.
+ * dom/DocumentStyleSheetCollection.h: Removed.
+ * dom/ExtensionStyleSheets.cpp: Copied from Source/WebCore/dom/DocumentStyleSheetCollection.cpp.
+ (WebCore::ExtensionStyleSheets::ExtensionStyleSheets):
+ (WebCore::ExtensionStyleSheets::pageUserSheet):
+ (WebCore::ExtensionStyleSheets::clearPageUserSheet):
+ (WebCore::ExtensionStyleSheets::updatePageUserSheet):
+ (WebCore::ExtensionStyleSheets::injectedUserStyleSheets):
+ (WebCore::ExtensionStyleSheets::injectedAuthorStyleSheets):
+ (WebCore::ExtensionStyleSheets::updateInjectedStyleSheetCache):
+ (WebCore::ExtensionStyleSheets::invalidateInjectedStyleSheetCache):
+ (WebCore::ExtensionStyleSheets::addUserSheet):
+ (WebCore::ExtensionStyleSheets::addDisplayNoneSelector):
+ (WebCore::ExtensionStyleSheets::maybeAddContentExtensionSheet):
+ (WebCore::ExtensionStyleSheets::styleResolverChangedTimerFired):
+ (WebCore::ExtensionStyleSheets::detachFromDocument):
+ (WebCore::DocumentStyleSheetCollection::DocumentStyleSheetCollection): Deleted.
+ (WebCore::DocumentStyleSheetCollection::combineCSSFeatureFlags): Deleted.
+ (WebCore::DocumentStyleSheetCollection::resetCSSFeatureFlags): Deleted.
+ (WebCore::DocumentStyleSheetCollection::pageUserSheet): Deleted.
+ (WebCore::DocumentStyleSheetCollection::clearPageUserSheet): Deleted.
+ (WebCore::DocumentStyleSheetCollection::updatePageUserSheet): Deleted.
+ (WebCore::DocumentStyleSheetCollection::injectedUserStyleSheets): Deleted.
+ (WebCore::DocumentStyleSheetCollection::injectedAuthorStyleSheets): Deleted.
+ (WebCore::DocumentStyleSheetCollection::updateInjectedStyleSheetCache): Deleted.
+ (WebCore::DocumentStyleSheetCollection::invalidateInjectedStyleSheetCache): Deleted.
+ (WebCore::DocumentStyleSheetCollection::addAuthorSheet): Deleted.
+ (WebCore::DocumentStyleSheetCollection::addUserSheet): Deleted.
+ (WebCore::DocumentStyleSheetCollection::addDisplayNoneSelector): Deleted.
+ (WebCore::DocumentStyleSheetCollection::maybeAddContentExtensionSheet): Deleted.
+ (WebCore::DocumentStyleSheetCollection::styleResolverChangedTimerFired): Deleted.
+ (WebCore::DocumentStyleSheetCollection::removePendingSheet): Deleted.
+ (WebCore::DocumentStyleSheetCollection::addStyleSheetCandidateNode): Deleted.
+ (WebCore::DocumentStyleSheetCollection::removeStyleSheetCandidateNode): Deleted.
+ (WebCore::DocumentStyleSheetCollection::collectActiveStyleSheets): Deleted.
+ (WebCore::DocumentStyleSheetCollection::analyzeStyleSheetChange): Deleted.
+ (WebCore::filterEnabledNonemptyCSSStyleSheets): Deleted.
+ (WebCore::DocumentStyleSheetCollection::updateActiveStyleSheets): Deleted.
+ (WebCore::DocumentStyleSheetCollection::activeStyleSheetsForInspector): Deleted.
+ (WebCore::DocumentStyleSheetCollection::activeStyleSheetsContains): Deleted.
+ (WebCore::DocumentStyleSheetCollection::detachFromDocument): Deleted.
+ * dom/ExtensionStyleSheets.h: Copied from Source/WebCore/dom/DocumentStyleSheetCollection.h.
+ (WebCore::ExtensionStyleSheets::documentUserStyleSheets):
+ (WebCore::DocumentStyleSheetCollection::styleSheetsForStyleSheetList): Deleted.
+ (WebCore::DocumentStyleSheetCollection::activeAuthorStyleSheets): Deleted.
+ (WebCore::DocumentStyleSheetCollection::documentUserStyleSheets): Deleted.
+ (WebCore::DocumentStyleSheetCollection::documentAuthorStyleSheets): Deleted.
+ (WebCore::DocumentStyleSheetCollection::pendingUpdateType): Deleted.
+ (WebCore::DocumentStyleSheetCollection::setPendingUpdateType): Deleted.
+ (WebCore::DocumentStyleSheetCollection::flushPendingUpdates): Deleted.
+ (WebCore::DocumentStyleSheetCollection::preferredStylesheetSetName): Deleted.
+ (WebCore::DocumentStyleSheetCollection::selectedStylesheetSetName): Deleted.
+ (WebCore::DocumentStyleSheetCollection::setPreferredStylesheetSetName): Deleted.
+ (WebCore::DocumentStyleSheetCollection::setSelectedStylesheetSetName): Deleted.
+ (WebCore::DocumentStyleSheetCollection::addPendingSheet): Deleted.
+ (WebCore::DocumentStyleSheetCollection::hasPendingSheets): Deleted.
+ (WebCore::DocumentStyleSheetCollection::usesFirstLineRules): Deleted.
+ (WebCore::DocumentStyleSheetCollection::usesFirstLetterRules): Deleted.
+ (WebCore::DocumentStyleSheetCollection::usesRemUnits): Deleted.
+ (WebCore::DocumentStyleSheetCollection::setUsesRemUnit): Deleted.
+ (WebCore::DocumentStyleSheetCollection::usesStyleBasedEditability): Deleted.
+ (WebCore::DocumentStyleSheetCollection::setUsesStyleBasedEditability): Deleted.
+ * dom/InlineStyleSheetOwner.cpp:
+ (WebCore::InlineStyleSheetOwner::insertedIntoDocument):
+ (WebCore::InlineStyleSheetOwner::removedFromDocument):
+ (WebCore::InlineStyleSheetOwner::clearDocumentData):
+ (WebCore::InlineStyleSheetOwner::childrenChanged):
+ (WebCore::InlineStyleSheetOwner::createSheet):
+ (WebCore::InlineStyleSheetOwner::sheetLoaded):
+ (WebCore::InlineStyleSheetOwner::startLoadingDynamicSheet):
+ * dom/ProcessingInstruction.cpp:
+ (WebCore::ProcessingInstruction::~ProcessingInstruction):
+ (WebCore::ProcessingInstruction::nodeName):
+ (WebCore::ProcessingInstruction::checkStyleSheet):
+ (WebCore::ProcessingInstruction::sheetLoaded):
+ (WebCore::ProcessingInstruction::insertedInto):
+ (WebCore::ProcessingInstruction::removedFrom):
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::~HTMLLinkElement):
+ (WebCore::HTMLLinkElement::insertedInto):
+ (WebCore::HTMLLinkElement::removedFrom):
+ (WebCore::HTMLLinkElement::addPendingSheet):
+ (WebCore::HTMLLinkElement::removePendingSheet):
+ * html/HTMLQuoteElement.cpp:
+ * inspector/InspectorCSSAgent.cpp:
+ (WebCore::InspectorCSSAgent::collectAllDocumentStyleSheets):
+ (WebCore::InspectorCSSAgent::buildObjectForRule):
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::commitData):
+ * page/Page.cpp:
+ (WebCore::Page::userStyleSheetLocationChanged):
+ (WebCore::Page::setUserContentController):
+ * page/PageGroup.cpp:
+ * page/UserContentController.cpp:
+ (WebCore::UserContentController::invalidateInjectedStyleSheetCacheInAllFrames):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::lineHeight):
+ (WebCore::RenderBlock::getFirstLetter):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::uncachedFirstLineStyle):
+ (WebCore::RenderElement::cachedFirstLineStyle):
+ * rendering/RenderElement.h:
+ (WebCore::RenderElement::firstLineStyle):
+ (WebCore::RenderElement::setAncestorLineBoxDirty):
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::updateAlwaysCreateLineBoxes):
+ (WebCore::RenderInline::lineHeight):
+ * rendering/RenderLineBreak.cpp:
+ (WebCore::RenderLineBreak::lineHeight):
+ * rendering/RootInlineBox.cpp:
+ (WebCore::RootInlineBox::verticalPositionForBox):
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::resolveLocal):
+
</ins><span class="cx"> 2015-09-23 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> HTMLOutputElement.htmlFor should be settable
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -13525,6 +13525,20 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\dom\AuthorStyleSheets.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\dom\BeforeTextInsertedEvent.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -14001,20 +14015,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dom\DocumentStyleSheetCollection.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\dom\DocumentType.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -14296,6 +14296,20 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\dom\ExtensionStyleSheets.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\dom\GenericEventQueue.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -21970,6 +21984,7 @@
</span><span class="cx"> <ClInclude Include="..\dom\AnimationEvent.h" />
</span><span class="cx"> <ClInclude Include="..\dom\Attr.h" />
</span><span class="cx"> <ClInclude Include="..\dom\Attribute.h" />
</span><ins>+ <ClInclude Include="..\dom\AuthorStyleSheets.h" />
</ins><span class="cx"> <ClInclude Include="..\dom\BeforeLoadEvent.h" />
</span><span class="cx"> <ClInclude Include="..\dom\BeforeTextInsertedEvent.h" />
</span><span class="cx"> <ClInclude Include="..\dom\BeforeUnloadEvent.h" />
</span><span class="lines">@@ -22009,7 +22024,6 @@
</span><span class="cx"> <ClInclude Include="..\dom\DocumentOrderedMap.h" />
</span><span class="cx"> <ClInclude Include="..\dom\DocumentParser.h" />
</span><span class="cx"> <ClInclude Include="..\dom\DocumentSharedObjectPool.h" />
</span><del>- <ClInclude Include="..\dom\DocumentStyleSheetCollection.h" />
</del><span class="cx"> <ClInclude Include="..\dom\DocumentTiming.h" />
</span><span class="cx"> <ClInclude Include="..\dom\DocumentType.h" />
</span><span class="cx"> <ClInclude Include="..\dom\DOMCoreException.h" />
</span><span class="lines">@@ -22043,6 +22057,7 @@
</span><span class="cx"> <ClInclude Include="..\dom\ExceptionBase.h" />
</span><span class="cx"> <ClInclude Include="..\dom\ExceptionCode.h" />
</span><span class="cx"> <ClInclude Include="..\dom\ExceptionCodePlaceholder.h" />
</span><ins>+ <ClInclude Include="..\dom\ExtensionStyleSheets.h" />
</ins><span class="cx"> <ClInclude Include="..\dom\GenericEventQueue.h" />
</span><span class="cx"> <ClInclude Include="..\dom\HashChangeEvent.h" />
</span><span class="cx"> <ClInclude Include="..\dom\IconURL.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -6381,6 +6381,8 @@
</span><span class="cx"> E45390490EAFD637003695C8 /* WebCoreSystemInterfaceIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390380EAFD637003695C8 /* WebCoreSystemInterfaceIOS.mm */; };
</span><span class="cx"> E453904D0EAFD637003695C8 /* WidgetIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E453903C0EAFD637003695C8 /* WidgetIOS.mm */; };
</span><span class="cx"> E45390AE0EAFF4B5003695C8 /* SystemMemoryIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45390AD0EAFF4B5003695C8 /* SystemMemoryIOS.cpp */; };
</span><ins>+ E461D65D1BB0C7F000CB5645 /* AuthorStyleSheets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E461D65C1BB0C7F000CB5645 /* AuthorStyleSheets.cpp */; settings = {ASSET_TAGS = (); }; };
+ E461D65F1BB0C80D00CB5645 /* AuthorStyleSheets.h in Headers */ = {isa = PBXBuildFile; fileRef = E461D65E1BB0C80D00CB5645 /* AuthorStyleSheets.h */; settings = {ASSET_TAGS = (); }; };
</ins><span class="cx"> E462A4A1113E71BE004A4220 /* IntPointHash.h in Headers */ = {isa = PBXBuildFile; fileRef = E462A4A0113E71BE004A4220 /* IntPointHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> E46A2B1C17CA65B9000DBCD8 /* TypedElementDescendantIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = E46A2B1B17CA65B9000DBCD8 /* TypedElementDescendantIterator.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> E46A2B1E17CA76B1000DBCD8 /* ElementChildIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = E46A2B1D17CA76B1000DBCD8 /* ElementChildIterator.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -6390,8 +6392,8 @@
</span><span class="cx"> E4778B80115A581A00B5D372 /* JSCustomEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = E4778B7E115A581A00B5D372 /* JSCustomEvent.h */; };
</span><span class="cx"> E47B4BE80E71241600038854 /* CachedResourceHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = E47B4BE60E71241600038854 /* CachedResourceHandle.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> E47B4BE90E71241600038854 /* CachedResourceHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E47B4BE70E71241600038854 /* CachedResourceHandle.cpp */; };
</span><del>- E47E276516036ED200EE2AFB /* DocumentStyleSheetCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = E47E276416036ED200EE2AFB /* DocumentStyleSheetCollection.h */; settings = {ATTRIBUTES = (Private, ); }; };
- E47E276816036EDC00EE2AFB /* DocumentStyleSheetCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E47E276716036EDC00EE2AFB /* DocumentStyleSheetCollection.cpp */; };
</del><ins>+ E47E276516036ED200EE2AFB /* ExtensionStyleSheets.h in Headers */ = {isa = PBXBuildFile; fileRef = E47E276416036ED200EE2AFB /* ExtensionStyleSheets.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ E47E276816036EDC00EE2AFB /* ExtensionStyleSheets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E47E276716036EDC00EE2AFB /* ExtensionStyleSheets.cpp */; };
</ins><span class="cx"> E48944A2180B57D800F165D8 /* SimpleLineLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E48944A0180B57D800F165D8 /* SimpleLineLayout.cpp */; };
</span><span class="cx"> E48944A3180B57D800F165D8 /* SimpleLineLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = E48944A1180B57D800F165D8 /* SimpleLineLayout.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> E4916FF7195DF6A0005AB349 /* LayerFlushThrottleState.h in Headers */ = {isa = PBXBuildFile; fileRef = E4916FF6195DF6A0005AB349 /* LayerFlushThrottleState.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -14132,6 +14134,8 @@
</span><span class="cx"> E45390380EAFD637003695C8 /* WebCoreSystemInterfaceIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreSystemInterfaceIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> E453903C0EAFD637003695C8 /* WidgetIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WidgetIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> E45390AD0EAFF4B5003695C8 /* SystemMemoryIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SystemMemoryIOS.cpp; sourceTree = "<group>"; };
</span><ins>+ E461D65C1BB0C7F000CB5645 /* AuthorStyleSheets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthorStyleSheets.cpp; sourceTree = "<group>"; };
+ E461D65E1BB0C80D00CB5645 /* AuthorStyleSheets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthorStyleSheets.h; sourceTree = "<group>"; };
</ins><span class="cx"> E462A4A0113E71BE004A4220 /* IntPointHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntPointHash.h; sourceTree = "<group>"; };
</span><span class="cx"> E46A2B1B17CA65B9000DBCD8 /* TypedElementDescendantIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TypedElementDescendantIterator.h; sourceTree = "<group>"; };
</span><span class="cx"> E46A2B1D17CA76B1000DBCD8 /* ElementChildIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementChildIterator.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -14141,8 +14145,8 @@
</span><span class="cx"> E47A97CF163059FC005DCD99 /* StyleInvalidationAnalysis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleInvalidationAnalysis.h; sourceTree = "<group>"; };
</span><span class="cx"> E47B4BE60E71241600038854 /* CachedResourceHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedResourceHandle.h; sourceTree = "<group>"; };
</span><span class="cx"> E47B4BE70E71241600038854 /* CachedResourceHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedResourceHandle.cpp; sourceTree = "<group>"; };
</span><del>- E47E276416036ED200EE2AFB /* DocumentStyleSheetCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentStyleSheetCollection.h; sourceTree = "<group>"; };
- E47E276716036EDC00EE2AFB /* DocumentStyleSheetCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentStyleSheetCollection.cpp; sourceTree = "<group>"; };
</del><ins>+ E47E276416036ED200EE2AFB /* ExtensionStyleSheets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtensionStyleSheets.h; sourceTree = "<group>"; };
+ E47E276716036EDC00EE2AFB /* ExtensionStyleSheets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExtensionStyleSheets.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> E48944A0180B57D800F165D8 /* SimpleLineLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleLineLayout.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E48944A1180B57D800F165D8 /* SimpleLineLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleLineLayout.h; sourceTree = "<group>"; };
</span><span class="cx"> E4916FF6195DF6A0005AB349 /* LayerFlushThrottleState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerFlushThrottleState.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -23285,6 +23289,8 @@
</span><span class="cx"> A8C4A7FB09D563270003AC8D /* Attr.h */,
</span><span class="cx"> 93EEC1E509C2877700C515D1 /* Attr.idl */,
</span><span class="cx"> A8C4A7F909D563270003AC8D /* Attribute.h */,
</span><ins>+ E461D65C1BB0C7F000CB5645 /* AuthorStyleSheets.cpp */,
+ E461D65E1BB0C80D00CB5645 /* AuthorStyleSheets.h */,
</ins><span class="cx"> 760847CD19A6A27700428CCC /* AutocompleteErrorEvent.h */,
</span><span class="cx"> 760847CF19A6A28600428CCC /* AutocompleteErrorEvent.idl */,
</span><span class="cx"> BC9462D7107A7B4C00857193 /* BeforeLoadEvent.h */,
</span><span class="lines">@@ -23380,8 +23386,6 @@
</span><span class="cx"> BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */,
</span><span class="cx"> AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */,
</span><span class="cx"> AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */,
</span><del>- E47E276716036EDC00EE2AFB /* DocumentStyleSheetCollection.cpp */,
- E47E276416036ED200EE2AFB /* DocumentStyleSheetCollection.h */,
</del><span class="cx"> 86D982F6125C154000AD9E3D /* DocumentTiming.h */,
</span><span class="cx"> A8185F3209765765005826D9 /* DocumentType.cpp */,
</span><span class="cx"> A8185F3109765765005826D9 /* DocumentType.h */,
</span><span class="lines">@@ -23455,6 +23459,8 @@
</span><span class="cx"> 935FBCF109BA143B00E230B1 /* ExceptionCode.h */,
</span><span class="cx"> A7CACDB013CE875B00BBBE3F /* ExceptionCodePlaceholder.cpp */,
</span><span class="cx"> A74BB76A13BDA86300FF7BF0 /* ExceptionCodePlaceholder.h */,
</span><ins>+ E47E276716036EDC00EE2AFB /* ExtensionStyleSheets.cpp */,
+ E47E276416036ED200EE2AFB /* ExtensionStyleSheets.h */,
</ins><span class="cx"> B6D9D23414EABD260090D75E /* FocusEvent.cpp */,
</span><span class="cx"> B6D9D23314EABD260090D75E /* FocusEvent.h */,
</span><span class="cx"> B6D9D27214EABF030090D75E /* FocusEvent.idl */,
</span><span class="lines">@@ -24629,7 +24635,7 @@
</span><span class="cx"> BCCFBAE80B5152ED0001F1D7 /* DocumentParser.h in Headers */,
</span><span class="cx"> 4A4F48AA16B0DFC000EDBB29 /* DocumentRuleSets.h in Headers */,
</span><span class="cx"> AD6E71AD1668899D00320C13 /* DocumentSharedObjectPool.h in Headers */,
</span><del>- E47E276516036ED200EE2AFB /* DocumentStyleSheetCollection.h in Headers */,
</del><ins>+ E47E276516036ED200EE2AFB /* ExtensionStyleSheets.h in Headers */,
</ins><span class="cx"> 0B90561A0F2578BF0095FF6A /* DocumentThreadableLoader.h in Headers */,
</span><span class="cx"> 86D982F7125C154000AD9E3D /* DocumentTiming.h in Headers */,
</span><span class="cx"> A8185F3909765766005826D9 /* DocumentType.h in Headers */,
</span><span class="lines">@@ -26831,6 +26837,7 @@
</span><span class="cx"> 99CC0B5E18BE984A006CEBCC /* SegmentedInputStorage.h in Headers */,
</span><span class="cx"> B2C3DA2F0D006C1D00EF6F26 /* SegmentedString.h in Headers */,
</span><span class="cx"> BEA807C90F714A0300524199 /* SelectionRect.h in Headers */,
</span><ins>+ E461D65F1BB0C80D00CB5645 /* AuthorStyleSheets.h in Headers */,
</ins><span class="cx"> 51405C89190B014400754F94 /* SelectionRectGatherer.h in Headers */,
</span><span class="cx"> CDCFABBD18C0AF78006F8450 /* SelectionSubtreeRoot.h in Headers */,
</span><span class="cx"> E44B4BB4141650D7002B1D8B /* SelectorChecker.h in Headers */,
</span><span class="lines">@@ -28385,7 +28392,7 @@
</span><span class="cx"> A8C2280E11D4A59700D5A7D3 /* DocumentParser.cpp in Sources */,
</span><span class="cx"> 4A4F48A916B0DFC000EDBB29 /* DocumentRuleSets.cpp in Sources */,
</span><span class="cx"> AD6E71AC1668899D00320C13 /* DocumentSharedObjectPool.cpp in Sources */,
</span><del>- E47E276816036EDC00EE2AFB /* DocumentStyleSheetCollection.cpp in Sources */,
</del><ins>+ E47E276816036EDC00EE2AFB /* ExtensionStyleSheets.cpp in Sources */,
</ins><span class="cx"> 0B9056190F2578BE0095FF6A /* DocumentThreadableLoader.cpp in Sources */,
</span><span class="cx"> A8185F3A09765766005826D9 /* DocumentType.cpp in Sources */,
</span><span class="cx"> 973889A0116EA9DC00ADF313 /* DocumentWriter.cpp in Sources */,
</span><span class="lines">@@ -28490,6 +28497,7 @@
</span><span class="cx"> 85ECBEF80AA7626900544F0B /* DOMHTMLParamElement.mm in Sources */,
</span><span class="cx"> 7C33F3621B4A050400502CAF /* JSDocumentFragmentCustom.cpp in Sources */,
</span><span class="cx"> 85183B490AA6926100F19FA3 /* DOMHTMLPreElement.mm in Sources */,
</span><ins>+ E461D65D1BB0C7F000CB5645 /* AuthorStyleSheets.cpp in Sources */,
</ins><span class="cx"> A4226E961163D73A008B8397 /* DOMHTMLProgressElement.mm in Sources */,
</span><span class="cx"> 85183B4B0AA6926100F19FA3 /* DOMHTMLQuoteElement.mm in Sources */,
</span><span class="cx"> 85DF819C0AA77E4B00486AD7 /* DOMHTMLScriptElement.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionsBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "DFABytecodeInterpreter.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "DocumentLoader.h"
</span><ins>+#include "ExtensionStyleSheets.h"
</ins><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "ResourceLoadInfo.h"
</span><span class="lines">@@ -176,7 +177,7 @@
</span><span class="cx"> if (resourceType == ResourceType::Document)
</span><span class="cx"> initiatingDocumentLoader.addPendingContentExtensionDisplayNoneSelector(action.extensionIdentifier(), action.stringArgument(), action.actionID());
</span><span class="cx"> else if (currentDocument)
</span><del>- currentDocument->styleSheetCollection().addDisplayNoneSelector(action.extensionIdentifier(), action.stringArgument(), action.actionID());
</del><ins>+ currentDocument->extensionStyleSheets().addDisplayNoneSelector(action.extensionIdentifier(), action.stringArgument(), action.actionID());
</ins><span class="cx"> break;
</span><span class="cx"> case ContentExtensions::ActionType::CSSDisplayNoneStyleSheet: {
</span><span class="cx"> StyleSheetContents* styleSheetContents = globalDisplayNoneStyleSheet(action.stringArgument());
</span><span class="lines">@@ -184,7 +185,7 @@
</span><span class="cx"> if (resourceType == ResourceType::Document)
</span><span class="cx"> initiatingDocumentLoader.addPendingContentExtensionSheet(action.stringArgument(), *styleSheetContents);
</span><span class="cx"> else if (currentDocument)
</span><del>- currentDocument->styleSheetCollection().maybeAddContentExtensionSheet(action.stringArgument(), *styleSheetContents);
</del><ins>+ currentDocument->extensionStyleSheets().maybeAddContentExtensionSheet(action.stringArgument(), *styleSheetContents);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleSheet.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleSheet.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/css/CSSStyleSheet.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CSSStyleSheet.h"
</span><span class="cx">
</span><ins>+#include "AuthorStyleSheets.h"
</ins><span class="cx"> #include "CSSCharsetRule.h"
</span><span class="cx"> #include "CSSFontFaceRule.h"
</span><span class="cx"> #include "CSSImportRule.h"
</span><span class="lines">@@ -30,8 +31,8 @@
</span><span class="cx"> #include "CSSStyleRule.h"
</span><span class="cx"> #include "CachedCSSStyleSheet.h"
</span><span class="cx"> #include "Document.h"
</span><del>-#include "DocumentStyleSheetCollection.h"
</del><span class="cx"> #include "ExceptionCode.h"
</span><ins>+#include "ExtensionStyleSheets.h"
</ins><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "HTMLStyleElement.h"
</span><span class="cx"> #include "MediaList.h"
</span><span class="lines">@@ -170,7 +171,7 @@
</span><span class="cx"> if (!owner)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (mutationType == RuleInsertion && !contentsWereClonedForMutation && !owner->styleSheetCollection().activeStyleSheetsContains(this)) {
</del><ins>+ if (mutationType == RuleInsertion && !contentsWereClonedForMutation && !owner->authorStyleSheets().activeStyleSheetsContains(this)) {
</ins><span class="cx"> if (insertedKeyframesRule) {
</span><span class="cx"> if (StyleResolver* resolver = owner->styleResolverIfExists())
</span><span class="cx"> resolver->addKeyframeStyle(insertedKeyframesRule);
</span></span></pre></div>
<a id="trunkSourceWebCorecssDocumentRuleSetscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DocumentRuleSets.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DocumentRuleSets.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/css/DocumentRuleSets.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSDefaultStyleSheets.h"
</span><span class="cx"> #include "CSSStyleSheet.h"
</span><del>-#include "DocumentStyleSheetCollection.h"
</del><ins>+#include "ExtensionStyleSheets.h"
</ins><span class="cx"> #include "MediaQueryEvaluator.h"
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "StyleSheetContents.h"
</span><span class="lines">@@ -46,13 +46,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentRuleSets::initUserStyle(DocumentStyleSheetCollection& styleSheetCollection, const MediaQueryEvaluator& medium, StyleResolver& resolver)
</del><ins>+void DocumentRuleSets::initUserStyle(ExtensionStyleSheets& extensionStyleSheets, const MediaQueryEvaluator& medium, StyleResolver& resolver)
</ins><span class="cx"> {
</span><span class="cx"> auto tempUserStyle = std::make_unique<RuleSet>();
</span><del>- if (CSSStyleSheet* pageUserSheet = styleSheetCollection.pageUserSheet())
</del><ins>+ if (CSSStyleSheet* pageUserSheet = extensionStyleSheets.pageUserSheet())
</ins><span class="cx"> tempUserStyle->addRulesFromSheet(&pageUserSheet->contents(), medium, &resolver);
</span><del>- collectRulesFromUserStyleSheets(styleSheetCollection.injectedUserStyleSheets(), *tempUserStyle, medium, resolver);
- collectRulesFromUserStyleSheets(styleSheetCollection.documentUserStyleSheets(), *tempUserStyle, medium, resolver);
</del><ins>+ collectRulesFromUserStyleSheets(extensionStyleSheets.injectedUserStyleSheets(), *tempUserStyle, medium, resolver);
+ collectRulesFromUserStyleSheets(extensionStyleSheets.documentUserStyleSheets(), *tempUserStyle, medium, resolver);
</ins><span class="cx"> if (tempUserStyle->ruleCount() > 0 || tempUserStyle->pageRules().size() > 0)
</span><span class="cx"> m_userStyle = WTF::move(tempUserStyle);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssDocumentRuleSetsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DocumentRuleSets.h (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DocumentRuleSets.h 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/css/DocumentRuleSets.h 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> RuleSet* sibling() const { return m_siblingRuleSet.get(); }
</span><span class="cx"> RuleSet* uncommonAttribute() const { return m_uncommonAttributeRuleSet.get(); }
</span><span class="cx">
</span><del>- void initUserStyle(DocumentStyleSheetCollection&, const MediaQueryEvaluator&, StyleResolver&);
</del><ins>+ void initUserStyle(ExtensionStyleSheets&, const MediaQueryEvaluator&, StyleResolver&);
</ins><span class="cx"> void resetAuthorStyle();
</span><span class="cx"> void appendAuthorStyleSheets(unsigned firstNew, const Vector<RefPtr<CSSStyleSheet>>&, MediaQueryEvaluator*, InspectorCSSOMWrappers&, StyleResolver*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssInspectorCSSOMWrapperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorCSSOMWrappers.h"
</span><span class="cx">
</span><ins>+#include "AuthorStyleSheets.h"
</ins><span class="cx"> #include "CSSDefaultStyleSheets.h"
</span><span class="cx"> #include "CSSImportRule.h"
</span><span class="cx"> #include "CSSMediaRule.h"
</span><span class="lines">@@ -36,7 +37,7 @@
</span><span class="cx"> #include "CSSStyleRule.h"
</span><span class="cx"> #include "CSSStyleSheet.h"
</span><span class="cx"> #include "CSSSupportsRule.h"
</span><del>-#include "DocumentStyleSheetCollection.h"
</del><ins>+#include "ExtensionStyleSheets.h"
</ins><span class="cx"> #include "StyleSheetContents.h"
</span><span class="cx"> #include "WebKitCSSRegionRule.h"
</span><span class="cx">
</span><span class="lines">@@ -95,16 +96,8 @@
</span><span class="cx"> collect(sheets[i].get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSOMWrappers::collectFromDocumentStyleSheetCollection(DocumentStyleSheetCollection& styleSheetCollection)
</del><ins>+CSSStyleRule* InspectorCSSOMWrappers::getWrapperForRuleInSheets(StyleRule* rule, AuthorStyleSheets& authorStyleSheets, ExtensionStyleSheets& extensionStyleSheets)
</ins><span class="cx"> {
</span><del>- collectFromStyleSheets(styleSheetCollection.activeAuthorStyleSheets());
- collect(styleSheetCollection.pageUserSheet());
- collectFromStyleSheets(styleSheetCollection.injectedUserStyleSheets());
- collectFromStyleSheets(styleSheetCollection.documentUserStyleSheets());
-}
-
-CSSStyleRule* InspectorCSSOMWrappers::getWrapperForRuleInSheets(StyleRule* rule, DocumentStyleSheetCollection& styleSheetCollection)
-{
</del><span class="cx"> if (m_styleRuleToCSSOMWrapperMap.isEmpty()) {
</span><span class="cx"> collectFromStyleSheetContents(m_styleSheetCSSOMWrapperSet, CSSDefaultStyleSheets::simpleDefaultStyleSheet);
</span><span class="cx"> collectFromStyleSheetContents(m_styleSheetCSSOMWrapperSet, CSSDefaultStyleSheets::defaultStyleSheet);
</span><span class="lines">@@ -115,7 +108,10 @@
</span><span class="cx"> collectFromStyleSheetContents(m_styleSheetCSSOMWrapperSet, CSSDefaultStyleSheets::fullscreenStyleSheet);
</span><span class="cx"> collectFromStyleSheetContents(m_styleSheetCSSOMWrapperSet, CSSDefaultStyleSheets::plugInsStyleSheet);
</span><span class="cx">
</span><del>- collectFromDocumentStyleSheetCollection(styleSheetCollection);
</del><ins>+ collectFromStyleSheets(authorStyleSheets.activeStyleSheets());
+ collect(extensionStyleSheets.pageUserSheet());
+ collectFromStyleSheets(extensionStyleSheets.injectedUserStyleSheets());
+ collectFromStyleSheets(extensionStyleSheets.documentUserStyleSheets());
</ins><span class="cx"> }
</span><span class="cx"> return m_styleRuleToCSSOMWrapperMap.get(rule);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssInspectorCSSOMWrappersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/InspectorCSSOMWrappers.h (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/InspectorCSSOMWrappers.h 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/css/InspectorCSSOMWrappers.h 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -31,9 +31,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class AuthorStyleSheets;
</ins><span class="cx"> class CSSStyleRule;
</span><span class="cx"> class CSSStyleSheet;
</span><del>-class DocumentStyleSheetCollection;
</del><ins>+class ExtensionStyleSheets;
</ins><span class="cx"> class StyleRule;
</span><span class="cx"> class StyleSheetContents;
</span><span class="cx">
</span><span class="lines">@@ -41,7 +42,7 @@
</span><span class="cx"> public:
</span><span class="cx"> // WARNING. This will construct CSSOM wrappers for all style rules and cache them in a map for significant memory cost.
</span><span class="cx"> // It is here to support inspector. Don't use for any regular engine functions.
</span><del>- CSSStyleRule* getWrapperForRuleInSheets(StyleRule*, DocumentStyleSheetCollection&);
</del><ins>+ CSSStyleRule* getWrapperForRuleInSheets(StyleRule*, AuthorStyleSheets&, ExtensionStyleSheets&);
</ins><span class="cx"> void collectFromStyleSheetIfNeeded(CSSStyleSheet*);
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -50,7 +51,6 @@
</span><span class="cx">
</span><span class="cx"> void collectFromStyleSheetContents(HashSet<RefPtr<CSSStyleSheet>>& sheetWrapperSet, StyleSheetContents*);
</span><span class="cx"> void collectFromStyleSheets(const Vector<RefPtr<CSSStyleSheet>>&);
</span><del>- void collectFromDocumentStyleSheetCollection(DocumentStyleSheetCollection&);
</del><span class="cx">
</span><span class="cx"> HashMap<StyleRule*, RefPtr<CSSStyleRule>> m_styleRuleToCSSOMWrapperMap;
</span><span class="cx"> HashSet<RefPtr<CSSStyleSheet>> m_styleSheetCSSOMWrapperSet;
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -64,7 +64,6 @@
</span><span class="cx"> #include "Counter.h"
</span><span class="cx"> #include "CounterContent.h"
</span><span class="cx"> #include "CursorList.h"
</span><del>-#include "DocumentStyleSheetCollection.h"
</del><span class="cx"> #include "ElementRuleCollector.h"
</span><span class="cx"> #include "FilterOperation.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="lines">@@ -301,8 +300,7 @@
</span><span class="cx">
</span><span class="cx"> m_ruleSets.resetAuthorStyle();
</span><span class="cx">
</span><del>- DocumentStyleSheetCollection& styleSheetCollection = m_document.styleSheetCollection();
- m_ruleSets.initUserStyle(styleSheetCollection, *m_medium, *this);
</del><ins>+ m_ruleSets.initUserStyle(m_document.extensionStyleSheets(), *m_medium, *this);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SVG_FONTS)
</span><span class="cx"> if (m_document.svgExtensions()) {
</span><span class="lines">@@ -311,8 +309,6 @@
</span><span class="cx"> m_document.fontSelector().addFontFaceRule(svgFontFaceElement->fontFaceRule(), svgFontFaceElement->isInUserAgentShadowTree());
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>-
- appendAuthorStyleSheets(0, styleSheetCollection.activeAuthorStyleSheets());
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StyleResolver::appendAuthorStyleSheets(unsigned firstNew, const Vector<RefPtr<CSSStyleSheet>>& styleSheets)
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleSheetListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleSheetList.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleSheetList.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/css/StyleSheetList.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -21,9 +21,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "StyleSheetList.h"
</span><span class="cx">
</span><ins>+#include "AuthorStyleSheets.h"
</ins><span class="cx"> #include "CSSStyleSheet.h"
</span><span class="cx"> #include "Document.h"
</span><del>-#include "DocumentStyleSheetCollection.h"
</del><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "HTMLStyleElement.h"
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -45,13 +45,13 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_document)
</span><span class="cx"> return m_detachedStyleSheets;
</span><del>- return m_document->styleSheetCollection().styleSheetsForStyleSheetList();
</del><ins>+ return m_document->authorStyleSheets().styleSheetsForStyleSheetList();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StyleSheetList::detachFromDocument()
</span><span class="cx"> {
</span><del>- m_detachedStyleSheets = m_document->styleSheetCollection().styleSheetsForStyleSheetList();
- m_document = 0;
</del><ins>+ m_detachedStyleSheets = m_document->authorStyleSheets().styleSheetsForStyleSheetList();
+ m_document = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned StyleSheetList::length() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomAuthorStyleSheetscppfromrev190153trunkSourceWebCoredomDocumentStyleSheetCollectioncpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/dom/AuthorStyleSheets.cpp (from rev 190153, trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp) (0 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/AuthorStyleSheets.cpp (rev 0)
+++ trunk/Source/WebCore/dom/AuthorStyleSheets.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -0,0 +1,363 @@
</span><ins>+/*
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ * (C) 1999 Antti Koivisto (koivisto@kde.org)
+ * (C) 2001 Dirk Mueller (mueller@kde.org)
+ * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
+ * Copyright (C) 2004-2009, 2011-2012, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
+ * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+#include "AuthorStyleSheets.h"
+
+#include "CSSStyleSheet.h"
+#include "Element.h"
+#include "ExtensionStyleSheets.h"
+#include "HTMLIFrameElement.h"
+#include "HTMLLinkElement.h"
+#include "HTMLStyleElement.h"
+#include "InspectorInstrumentation.h"
+#include "Page.h"
+#include "PageGroup.h"
+#include "ProcessingInstruction.h"
+#include "SVGNames.h"
+#include "SVGStyleElement.h"
+#include "Settings.h"
+#include "StyleInvalidationAnalysis.h"
+#include "StyleResolver.h"
+#include "StyleSheetContents.h"
+#include "StyleSheetList.h"
+#include "UserContentController.h"
+#include "UserContentURLPattern.h"
+#include "UserStyleSheet.h"
+
+namespace WebCore {
+
+using namespace ContentExtensions;
+using namespace HTMLNames;
+
+AuthorStyleSheets::AuthorStyleSheets(TreeScope& treeScope)
+ : m_document(treeScope.documentScope())
+{
+}
+
+// This method is called whenever a top-level stylesheet has finished loading.
+void AuthorStyleSheets::removePendingSheet(RemovePendingSheetNotificationType notification)
+{
+ // Make sure we knew this sheet was pending, and that our count isn't out of sync.
+ ASSERT(m_pendingStyleSheetCount > 0);
+
+ m_pendingStyleSheetCount--;
+
+#ifdef INSTRUMENT_LAYOUT_SCHEDULING
+ if (!ownerElement())
+ printf("Stylesheet loaded at time %d. %d stylesheets still remain.\n", elapsedTime(), m_pendingStylesheets);
+#endif
+
+ if (m_pendingStyleSheetCount)
+ return;
+
+ if (notification == RemovePendingSheetNotifyLater) {
+ m_document.setNeedsNotifyRemoveAllPendingStylesheet();
+ return;
+ }
+
+ m_document.didRemoveAllPendingStylesheet();
+}
+
+void AuthorStyleSheets::addStyleSheetCandidateNode(Node& node, bool createdByParser)
+{
+ if (!node.inDocument())
+ return;
+
+ // Until the <body> exists, we have no choice but to compare document positions,
+ // since styles outside of the body and head continue to be shunted into the head
+ // (and thus can shift to end up before dynamically added DOM content that is also
+ // outside the body).
+ if ((createdByParser && m_document.bodyOrFrameset()) || m_styleSheetCandidateNodes.isEmpty()) {
+ m_styleSheetCandidateNodes.add(&node);
+ return;
+ }
+
+ // Determine an appropriate insertion point.
+ auto begin = m_styleSheetCandidateNodes.begin();
+ auto end = m_styleSheetCandidateNodes.end();
+ auto it = end;
+ Node* followingNode = nullptr;
+ do {
+ --it;
+ Node* n = *it;
+ unsigned short position = n->compareDocumentPosition(&node);
+ if (position == Node::DOCUMENT_POSITION_FOLLOWING) {
+ m_styleSheetCandidateNodes.insertBefore(followingNode, &node);
+ return;
+ }
+ followingNode = n;
+ } while (it != begin);
+
+ m_styleSheetCandidateNodes.insertBefore(followingNode, &node);
+}
+
+void AuthorStyleSheets::removeStyleSheetCandidateNode(Node& node)
+{
+ m_styleSheetCandidateNodes.remove(&node);
+}
+
+void AuthorStyleSheets::collectActiveStyleSheets(Vector<RefPtr<StyleSheet>>& sheets)
+{
+ if (m_document.settings() && !m_document.settings()->authorAndUserStylesEnabled())
+ return;
+
+ for (auto& node : m_styleSheetCandidateNodes) {
+ StyleSheet* sheet = nullptr;
+ if (is<ProcessingInstruction>(*node)) {
+ // Processing instruction (XML documents only).
+ // We don't support linking to embedded CSS stylesheets, see <https://bugs.webkit.org/show_bug.cgi?id=49281> for discussion.
+ ProcessingInstruction& pi = downcast<ProcessingInstruction>(*node);
+ sheet = pi.sheet();
+#if ENABLE(XSLT)
+ // Don't apply XSL transforms to already transformed documents -- <rdar://problem/4132806>
+ if (pi.isXSL() && !m_document.transformSourceDocument()) {
+ // Don't apply XSL transforms until loading is finished.
+ if (!m_document.parsing())
+ m_document.applyXSLTransform(&pi);
+ return;
+ }
+#endif
+ } else if (is<HTMLLinkElement>(*node) || is<HTMLStyleElement>(*node) || is<SVGStyleElement>(*node)) {
+ Element& element = downcast<Element>(*node);
+ AtomicString title = element.fastGetAttribute(titleAttr);
+ bool enabledViaScript = false;
+ if (is<HTMLLinkElement>(element)) {
+ // <LINK> element
+ HTMLLinkElement& linkElement = downcast<HTMLLinkElement>(element);
+ if (linkElement.isDisabled())
+ continue;
+ enabledViaScript = linkElement.isEnabledViaScript();
+ if (linkElement.styleSheetIsLoading()) {
+ // it is loading but we should still decide which style sheet set to use
+ if (!enabledViaScript && !title.isEmpty() && m_preferredStylesheetSetName.isEmpty()) {
+ if (!linkElement.fastGetAttribute(relAttr).contains("alternate")) {
+ m_preferredStylesheetSetName = title;
+ m_selectedStylesheetSetName = title;
+ }
+ }
+ continue;
+ }
+ if (!linkElement.sheet())
+ title = nullAtom;
+ }
+ // Get the current preferred styleset. This is the
+ // set of sheets that will be enabled.
+ if (is<SVGStyleElement>(element))
+ sheet = downcast<SVGStyleElement>(element).sheet();
+ else if (is<HTMLLinkElement>(element))
+ sheet = downcast<HTMLLinkElement>(element).sheet();
+ else
+ sheet = downcast<HTMLStyleElement>(element).sheet();
+ // Check to see if this sheet belongs to a styleset
+ // (thus making it PREFERRED or ALTERNATE rather than
+ // PERSISTENT).
+ auto& rel = element.fastGetAttribute(relAttr);
+ if (!enabledViaScript && !title.isEmpty()) {
+ // Yes, we have a title.
+ if (m_preferredStylesheetSetName.isEmpty()) {
+ // No preferred set has been established. If
+ // we are NOT an alternate sheet, then establish
+ // us as the preferred set. Otherwise, just ignore
+ // this sheet.
+ if (is<HTMLStyleElement>(element) || !rel.contains("alternate"))
+ m_preferredStylesheetSetName = m_selectedStylesheetSetName = title;
+ }
+ if (title != m_preferredStylesheetSetName)
+ sheet = nullptr;
+ }
+
+ if (rel.contains("alternate") && title.isEmpty())
+ sheet = nullptr;
+ }
+ if (sheet)
+ sheets.append(sheet);
+ }
+}
+
+void AuthorStyleSheets::analyzeStyleSheetChange(UpdateFlag updateFlag, const Vector<RefPtr<CSSStyleSheet>>& newStylesheets, StyleResolverUpdateType& styleResolverUpdateType, bool& requiresFullStyleRecalc)
+{
+ styleResolverUpdateType = Reconstruct;
+ requiresFullStyleRecalc = true;
+
+ // Stylesheets of <style> elements that @import stylesheets are active but loading. We need to trigger a full recalc when such loads are done.
+ bool hasActiveLoadingStylesheet = false;
+ unsigned newStylesheetCount = newStylesheets.size();
+ for (unsigned i = 0; i < newStylesheetCount; ++i) {
+ if (newStylesheets[i]->isLoading())
+ hasActiveLoadingStylesheet = true;
+ }
+ if (m_hadActiveLoadingStylesheet && !hasActiveLoadingStylesheet) {
+ m_hadActiveLoadingStylesheet = false;
+ return;
+ }
+ m_hadActiveLoadingStylesheet = hasActiveLoadingStylesheet;
+
+ if (updateFlag != OptimizedUpdate)
+ return;
+ if (!m_document.styleResolverIfExists())
+ return;
+ StyleResolver& styleResolver = *m_document.styleResolverIfExists();
+
+ // Find out which stylesheets are new.
+ unsigned oldStylesheetCount = m_activeStyleSheets.size();
+ if (newStylesheetCount < oldStylesheetCount)
+ return;
+ Vector<StyleSheetContents*> addedSheets;
+ unsigned newIndex = 0;
+ for (unsigned oldIndex = 0; oldIndex < oldStylesheetCount; ++oldIndex) {
+ if (newIndex >= newStylesheetCount)
+ return;
+ while (m_activeStyleSheets[oldIndex] != newStylesheets[newIndex]) {
+ addedSheets.append(&newStylesheets[newIndex]->contents());
+ ++newIndex;
+ if (newIndex == newStylesheetCount)
+ return;
+ }
+ ++newIndex;
+ }
+ bool hasInsertions = !addedSheets.isEmpty();
+ while (newIndex < newStylesheetCount) {
+ addedSheets.append(&newStylesheets[newIndex]->contents());
+ ++newIndex;
+ }
+ // If all new sheets were added at the end of the list we can just add them to existing StyleResolver.
+ // If there were insertions we need to re-add all the stylesheets so rules are ordered correctly.
+ styleResolverUpdateType = hasInsertions ? Reset : Additive;
+
+ // If we are already parsing the body and so may have significant amount of elements, put some effort into trying to avoid style recalcs.
+ if (!m_document.bodyOrFrameset() || m_document.hasNodesWithPlaceholderStyle())
+ return;
+ StyleInvalidationAnalysis invalidationAnalysis(addedSheets, styleResolver.mediaQueryEvaluator());
+ if (invalidationAnalysis.dirtiesAllStyle())
+ return;
+ invalidationAnalysis.invalidateStyle(m_document);
+ requiresFullStyleRecalc = false;
+}
+
+static void filterEnabledNonemptyCSSStyleSheets(Vector<RefPtr<CSSStyleSheet>>& result, const Vector<RefPtr<StyleSheet>>& sheets)
+{
+ for (unsigned i = 0; i < sheets.size(); ++i) {
+ if (!is<CSSStyleSheet>(*sheets[i]))
+ continue;
+ CSSStyleSheet& sheet = downcast<CSSStyleSheet>(*sheets[i]);
+ if (sheet.disabled())
+ continue;
+ if (!sheet.length())
+ continue;
+ result.append(&sheet);
+ }
+}
+
+bool AuthorStyleSheets::updateActiveStyleSheets(UpdateFlag updateFlag)
+{
+ if (m_document.inStyleRecalc()) {
+ // SVG <use> element may manage to invalidate style selector in the middle of a style recalc.
+ // https://bugs.webkit.org/show_bug.cgi?id=54344
+ // FIXME: This should be fixed in SVG and the call site replaced by ASSERT(!m_inStyleRecalc).
+ m_pendingUpdateType = FullUpdate;
+ m_document.scheduleForcedStyleRecalc();
+ return false;
+
+ }
+ if (!m_document.hasLivingRenderTree())
+ return false;
+
+ Vector<RefPtr<StyleSheet>> activeStyleSheets;
+ collectActiveStyleSheets(activeStyleSheets);
+
+ Vector<RefPtr<CSSStyleSheet>> activeCSSStyleSheets;
+ activeCSSStyleSheets.appendVector(m_document.extensionStyleSheets().injectedAuthorStyleSheets());
+ activeCSSStyleSheets.appendVector(m_document.extensionStyleSheets().authorStyleSheetsForTesting());
+ filterEnabledNonemptyCSSStyleSheets(activeCSSStyleSheets, activeStyleSheets);
+
+ StyleResolverUpdateType styleResolverUpdateType;
+ bool requiresFullStyleRecalc;
+ analyzeStyleSheetChange(updateFlag, activeCSSStyleSheets, styleResolverUpdateType, requiresFullStyleRecalc);
+
+ if (styleResolverUpdateType == Reconstruct)
+ m_document.clearStyleResolver();
+ else {
+ StyleResolver& styleResolver = m_document.ensureStyleResolver();
+ if (styleResolverUpdateType == Reset) {
+ styleResolver.ruleSets().resetAuthorStyle();
+ styleResolver.appendAuthorStyleSheets(0, activeCSSStyleSheets);
+ } else {
+ ASSERT(styleResolverUpdateType == Additive);
+ styleResolver.appendAuthorStyleSheets(m_activeStyleSheets.size(), activeCSSStyleSheets);
+ }
+ }
+
+ m_weakCopyOfActiveStyleSheetListForFastLookup = nullptr;
+ m_activeStyleSheets.swap(activeCSSStyleSheets);
+ m_styleSheetsForStyleSheetList.swap(activeStyleSheets);
+
+ InspectorInstrumentation::activeStyleSheetsUpdated(m_document);
+
+ for (const auto& sheet : m_activeStyleSheets) {
+ if (sheet->contents().usesRemUnits())
+ m_usesRemUnits = true;
+ if (sheet->contents().usesStyleBasedEditability())
+ m_usesStyleBasedEditability = true;
+ }
+ m_pendingUpdateType = NoUpdate;
+
+ return requiresFullStyleRecalc;
+}
+
+const Vector<RefPtr<CSSStyleSheet>> AuthorStyleSheets::activeStyleSheetsForInspector() const
+{
+ Vector<RefPtr<CSSStyleSheet>> result;
+
+ result.appendVector(m_document.extensionStyleSheets().injectedAuthorStyleSheets());
+ result.appendVector(m_document.extensionStyleSheets().authorStyleSheetsForTesting());
+
+ for (auto& styleSheet : m_styleSheetsForStyleSheetList) {
+ if (!is<CSSStyleSheet>(*styleSheet))
+ continue;
+
+ CSSStyleSheet& sheet = downcast<CSSStyleSheet>(*styleSheet);
+ if (sheet.disabled())
+ continue;
+
+ result.append(&sheet);
+ }
+
+ return result;
+}
+
+bool AuthorStyleSheets::activeStyleSheetsContains(const CSSStyleSheet* sheet) const
+{
+ if (!m_weakCopyOfActiveStyleSheetListForFastLookup) {
+ m_weakCopyOfActiveStyleSheetListForFastLookup = std::make_unique<HashSet<const CSSStyleSheet*>>();
+ for (unsigned i = 0; i < m_activeStyleSheets.size(); ++i)
+ m_weakCopyOfActiveStyleSheetListForFastLookup->add(m_activeStyleSheets[i].get());
+ }
+ return m_weakCopyOfActiveStyleSheetListForFastLookup->contains(sheet);
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoredomAuthorStyleSheetshfromrev190074trunkSourceWebCoredomDocumentStyleSheetCollectionh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/dom/AuthorStyleSheets.h (from rev 190074, trunk/Source/WebCore/dom/DocumentStyleSheetCollection.h) (0 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/AuthorStyleSheets.h (rev 0)
+++ trunk/Source/WebCore/dom/AuthorStyleSheets.h 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -0,0 +1,138 @@
</span><ins>+/*
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ * (C) 1999 Antti Koivisto (koivisto@kde.org)
+ * (C) 2001 Dirk Mueller (mueller@kde.org)
+ * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
+ * Copyright (C) 2004-2010, 2012-2013, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef AuthorStyleSheets_h
+#define AuthorStyleSheets_h
+
+#include "Timer.h"
+#include <memory>
+#include <wtf/FastMalloc.h>
+#include <wtf/HashMap.h>
+#include <wtf/ListHashSet.h>
+#include <wtf/RefPtr.h>
+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class CSSStyleSheet;
+class Document;
+class Node;
+class StyleSheet;
+class StyleSheetContents;
+class StyleSheetList;
+class TreeScope;
+
+class AuthorStyleSheets {
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ explicit AuthorStyleSheets(TreeScope&);
+
+ const Vector<RefPtr<CSSStyleSheet>>& activeStyleSheets() const { return m_activeStyleSheets; }
+
+ const Vector<RefPtr<StyleSheet>>& styleSheetsForStyleSheetList() const { return m_styleSheetsForStyleSheetList; }
+ const Vector<RefPtr<CSSStyleSheet>> activeStyleSheetsForInspector() const;
+
+ void addStyleSheetCandidateNode(Node&, bool createdByParser);
+ void removeStyleSheetCandidateNode(Node&);
+
+ enum UpdateFlag { NoUpdate = 0, OptimizedUpdate, FullUpdate };
+
+ UpdateFlag pendingUpdateType() const { return m_pendingUpdateType; }
+ void setPendingUpdateType(UpdateFlag updateType)
+ {
+ if (updateType > m_pendingUpdateType)
+ m_pendingUpdateType = updateType;
+ }
+
+ void flushPendingUpdates()
+ {
+ if (m_pendingUpdateType != NoUpdate)
+ updateActiveStyleSheets(m_pendingUpdateType);
+ }
+
+ bool updateActiveStyleSheets(UpdateFlag);
+
+ String preferredStylesheetSetName() const { return m_preferredStylesheetSetName; }
+ String selectedStylesheetSetName() const { return m_selectedStylesheetSetName; }
+ void setPreferredStylesheetSetName(const String& name) { m_preferredStylesheetSetName = name; }
+ void setSelectedStylesheetSetName(const String& name) { m_selectedStylesheetSetName = name; }
+
+ void addPendingSheet() { m_pendingStyleSheetCount++; }
+ enum RemovePendingSheetNotificationType {
+ RemovePendingSheetNotifyImmediately,
+ RemovePendingSheetNotifyLater
+ };
+ void removePendingSheet(RemovePendingSheetNotificationType = RemovePendingSheetNotifyImmediately);
+
+ bool hasPendingSheets() const { return m_pendingStyleSheetCount > 0; }
+
+ bool usesRemUnits() const { return m_usesRemUnits; }
+ void setUsesRemUnit(bool b) { m_usesRemUnits = b; }
+ bool usesStyleBasedEditability() { return m_usesStyleBasedEditability; }
+
+ bool activeStyleSheetsContains(const CSSStyleSheet*) const;
+
+private:
+ void collectActiveStyleSheets(Vector<RefPtr<StyleSheet>>&);
+ enum StyleResolverUpdateType {
+ Reconstruct,
+ Reset,
+ Additive
+ };
+ void analyzeStyleSheetChange(UpdateFlag, const Vector<RefPtr<CSSStyleSheet>>& newStylesheets, StyleResolverUpdateType&, bool& requiresFullStyleRecalc);
+
+ Document& m_document;
+
+ Vector<RefPtr<StyleSheet>> m_styleSheetsForStyleSheetList;
+ Vector<RefPtr<CSSStyleSheet>> m_activeStyleSheets;
+
+ // This is a mirror of m_activeAuthorStyleSheets that gets populated on demand for activeStyleSheetsContains().
+ mutable std::unique_ptr<HashSet<const CSSStyleSheet*>> m_weakCopyOfActiveStyleSheetListForFastLookup;
+
+ // Track the number of currently loading top-level stylesheets needed for rendering.
+ // Sheets loaded using the @import directive are not included in this count.
+ // We use this count of pending sheets to detect when we can begin attaching
+ // elements and when it is safe to execute scripts.
+ int m_pendingStyleSheetCount { 0 };
+
+ bool m_hadActiveLoadingStylesheet { false };
+ UpdateFlag m_pendingUpdateType { NoUpdate };
+
+ ListHashSet<Node*> m_styleSheetCandidateNodes;
+
+ String m_preferredStylesheetSetName;
+ String m_selectedStylesheetSetName;
+
+ bool m_usesRemUnits { false };
+ bool m_usesStyleBasedEditability { false };
+};
+
+}
+
+#endif
+
</ins></span></pre></div>
<a id="trunkSourceWebCoredomDOMAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DOMAllInOne.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DOMAllInOne.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/dom/DOMAllInOne.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.cpp"
</span><span class="cx"> #include "AnimationEvent.cpp"
</span><ins>+#include "AuthorStyleSheets.cpp"
</ins><span class="cx"> #include "Attr.cpp"
</span><span class="cx"> #include "BeforeTextInsertedEvent.cpp"
</span><span class="cx"> #include "BeforeUnloadEvent.cpp"
</span><span class="lines">@@ -69,7 +70,6 @@
</span><span class="cx"> #include "DocumentOrderedMap.cpp"
</span><span class="cx"> #include "DocumentParser.cpp"
</span><span class="cx"> #include "DocumentSharedObjectPool.cpp"
</span><del>-#include "DocumentStyleSheetCollection.cpp"
</del><span class="cx"> #include "DocumentType.cpp"
</span><span class="cx"> #include "Element.cpp"
</span><span class="cx"> #include "ElementData.cpp"
</span><span class="lines">@@ -85,6 +85,7 @@
</span><span class="cx"> #include "EventTarget.cpp"
</span><span class="cx"> #include "ExceptionBase.cpp"
</span><span class="cx"> #include "ExceptionCodePlaceholder.cpp"
</span><ins>+#include "ExtensionStyleSheets.cpp"
</ins><span class="cx"> #include "FocusEvent.cpp"
</span><span class="cx"> #include "GenericEventQueue.cpp"
</span><span class="cx"> #include "IdTargetObserver.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "AXObjectCache.h"
</span><span class="cx"> #include "AnimationController.h"
</span><span class="cx"> #include "Attr.h"
</span><ins>+#include "AuthorStyleSheets.h"
</ins><span class="cx"> #include "CDATASection.h"
</span><span class="cx"> #include "CSSFontSelector.h"
</span><span class="cx"> #include "CSSStyleDeclaration.h"
</span><span class="lines">@@ -57,6 +58,7 @@
</span><span class="cx"> #include "EntityReference.h"
</span><span class="cx"> #include "EventFactory.h"
</span><span class="cx"> #include "EventHandler.h"
</span><ins>+#include "ExtensionStyleSheets.h"
</ins><span class="cx"> #include "FocusController.h"
</span><span class="cx"> #include "FontLoader.h"
</span><span class="cx"> #include "FormController.h"
</span><span class="lines">@@ -439,7 +441,8 @@
</span><span class="cx"> , m_domTreeVersion(++s_globalTreeVersion)
</span><span class="cx"> , m_listenerTypes(0)
</span><span class="cx"> , m_mutationObserverTypes(0)
</span><del>- , m_styleSheetCollection(*this)
</del><ins>+ , m_authorStyleSheets(std::make_unique<AuthorStyleSheets>(*this))
+ , m_extensionStyleSheets(std::make_unique<ExtensionStyleSheets>(*this))
</ins><span class="cx"> , m_visitedLinkState(std::make_unique<VisitedLinkState>(*this))
</span><span class="cx"> , m_visuallyOrdered(false)
</span><span class="cx"> , m_readyState(Complete)
</span><span class="lines">@@ -624,7 +627,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_elementSheet)
</span><span class="cx"> m_elementSheet->detachFromDocument();
</span><del>- m_styleSheetCollection.detachFromDocument();
</del><ins>+ extensionStyleSheets().detachFromDocument();
</ins><span class="cx">
</span><span class="cx"> clearStyleResolver(); // We need to destroy CSSFontSelector before destroying m_cachedResourceLoader.
</span><span class="cx">
</span><span class="lines">@@ -791,8 +794,8 @@
</span><span class="cx">
</span><span class="cx"> if (inQuirksMode() != wasInQuirksMode) {
</span><span class="cx"> // All user stylesheets have to reparse using the different mode.
</span><del>- m_styleSheetCollection.clearPageUserSheet();
- m_styleSheetCollection.invalidateInjectedStyleSheetCache();
</del><ins>+ extensionStyleSheets().clearPageUserSheet();
+ extensionStyleSheets().invalidateInjectedStyleSheetCache();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1810,7 +1813,7 @@
</span><span class="cx"> // re-attaching our containing iframe, which when asked HTMLFrameElementBase::isURLAllowed
</span><span class="cx"> // hits a null-dereference due to security code always assuming the document has a SecurityOrigin.
</span><span class="cx">
</span><del>- m_styleSheetCollection.flushPendingUpdates();
</del><ins>+ authorStyleSheets().flushPendingUpdates();
</ins><span class="cx">
</span><span class="cx"> frameView.willRecalcStyle();
</span><span class="cx">
</span><span class="lines">@@ -1818,7 +1821,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: We never reset this flags.
</span><span class="cx"> if (m_elementSheet && m_elementSheet->contents().usesRemUnits())
</span><del>- m_styleSheetCollection.setUsesRemUnit(true);
</del><ins>+ authorStyleSheets().setUsesRemUnit(true);
</ins><span class="cx"> // We don't call setUsesStyleBasedEditability here because the whole point of the flag is to avoid style recalc.
</span><span class="cx"> // i.e. updating the flag here would be too late.
</span><span class="cx">
</span><span class="lines">@@ -1845,10 +1848,6 @@
</span><span class="cx"> unscheduleStyleRecalc();
</span><span class="cx">
</span><span class="cx"> m_inStyleRecalc = false;
</span><del>-
- // Pseudo element removal and similar may only work with these flags still set. Reset them after the style recalc.
- if (m_styleResolver)
- m_styleSheetCollection.resetCSSFeatureFlags();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If we wanted to call implicitClose() during recalcStyle, do so now that we're finished.
</span><span class="lines">@@ -2117,7 +2116,7 @@
</span><span class="cx"> if (Settings* settings = this->settings())
</span><span class="cx"> matchAuthorAndUserStyles = settings->authorAndUserStylesEnabled();
</span><span class="cx"> m_styleResolver = std::make_unique<StyleResolver>(*this, matchAuthorAndUserStyles);
</span><del>- m_styleSheetCollection.combineCSSFeatureFlags();
</del><ins>+ m_styleResolver->appendAuthorStyleSheets(0, authorStyleSheets().activeStyleSheets());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::fontsNeedUpdate(FontSelector&)
</span><span class="lines">@@ -3077,9 +3076,9 @@
</span><span class="cx"> ASSERT(!m_renderView || !m_renderView->frameView().isPainting());
</span><span class="cx"> ASSERT(!m_inStyleRecalc);
</span><span class="cx">
</span><del>- auto& collection = document().styleSheetCollection();
- collection.flushPendingUpdates();
- return collection.usesStyleBasedEditability();
</del><ins>+ auto& authorSheets = const_cast<AuthorStyleSheets&>(authorStyleSheets());
+ authorSheets.flushPendingUpdates();
+ return authorSheets.usesStyleBasedEditability();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::processHttpEquiv(const String& equiv, const String& content)
</span><span class="lines">@@ -3119,8 +3118,8 @@
</span><span class="cx"> // For more info, see the test at:
</span><span class="cx"> // http://www.hixie.ch/tests/evil/css/import/main/preferred.html
</span><span class="cx"> // -dwh
</span><del>- m_styleSheetCollection.setSelectedStylesheetSetName(content);
- m_styleSheetCollection.setPreferredStylesheetSetName(content);
</del><ins>+ authorStyleSheets().setSelectedStylesheetSetName(content);
+ authorStyleSheets().setPreferredStylesheetSetName(content);
</ins><span class="cx"> styleResolverChanged(DeferRecalcStyle);
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -3473,17 +3472,17 @@
</span><span class="cx">
</span><span class="cx"> String Document::preferredStylesheetSet() const
</span><span class="cx"> {
</span><del>- return m_styleSheetCollection.preferredStylesheetSetName();
</del><ins>+ return authorStyleSheets().preferredStylesheetSetName();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String Document::selectedStylesheetSet() const
</span><span class="cx"> {
</span><del>- return m_styleSheetCollection.selectedStylesheetSetName();
</del><ins>+ return authorStyleSheets().selectedStylesheetSetName();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::setSelectedStylesheetSet(const String& aString)
</span><span class="cx"> {
</span><del>- m_styleSheetCollection.setSelectedStylesheetSetName(aString);
</del><ins>+ authorStyleSheets().setSelectedStylesheetSetName(aString);
</ins><span class="cx"> styleResolverChanged(DeferRecalcStyle);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3502,7 +3501,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_optimizedStyleSheetUpdateTimer.isActive())
</span><span class="cx"> return;
</span><del>- m_styleSheetCollection.setPendingUpdateType(DocumentStyleSheetCollection::OptimizedUpdate);
</del><ins>+ authorStyleSheets().setPendingUpdateType(AuthorStyleSheets::OptimizedUpdate);
</ins><span class="cx"> m_optimizedStyleSheetUpdateTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3589,10 +3588,10 @@
</span><span class="cx"> printf("Beginning update of style selector at time %lld.\n", elapsedTime().count());
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- DocumentStyleSheetCollection::UpdateFlag styleSheetUpdate = (updateFlag == RecalcStyleIfNeeded || updateFlag == DeferRecalcStyleIfNeeded)
- ? DocumentStyleSheetCollection::OptimizedUpdate
- : DocumentStyleSheetCollection::FullUpdate;
- bool stylesheetChangeRequiresStyleRecalc = m_styleSheetCollection.updateActiveStyleSheets(styleSheetUpdate);
</del><ins>+ auto styleSheetUpdate = (updateFlag == RecalcStyleIfNeeded || updateFlag == DeferRecalcStyleIfNeeded)
+ ? AuthorStyleSheets::OptimizedUpdate
+ : AuthorStyleSheets::FullUpdate;
+ bool stylesheetChangeRequiresStyleRecalc = authorStyleSheets().updateActiveStyleSheets(styleSheetUpdate);
</ins><span class="cx">
</span><span class="cx"> if (updateFlag == DeferRecalcStyle) {
</span><span class="cx"> scheduleForcedStyleRecalc();
</span><span class="lines">@@ -6487,7 +6486,7 @@
</span><span class="cx">
</span><span class="cx"> bool Document::haveStylesheetsLoaded() const
</span><span class="cx"> {
</span><del>- return !m_styleSheetCollection.hasPendingSheets() || m_ignorePendingStylesheets;
</del><ins>+ return !authorStyleSheets().hasPendingSheets() || m_ignorePendingStylesheets;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Locale& Document::getCachedLocale(const AtomicString& locale)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/dom/Document.h 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><span class="cx"> * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
</span><del>- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004-2010, 2012-2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
</span><span class="cx"> * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "Color.h"
</span><span class="cx"> #include "ContainerNode.h"
</span><span class="cx"> #include "DocumentEventQueue.h"
</span><del>-#include "DocumentStyleSheetCollection.h"
</del><span class="cx"> #include "DocumentTiming.h"
</span><span class="cx"> #include "FocusDirection.h"
</span><span class="cx"> #include "FontSelector.h"
</span><span class="lines">@@ -70,6 +69,7 @@
</span><span class="cx">
</span><span class="cx"> class AXObjectCache;
</span><span class="cx"> class Attr;
</span><ins>+class AuthorStyleSheets;
</ins><span class="cx"> class CDATASection;
</span><span class="cx"> class CSSFontSelector;
</span><span class="cx"> class CSSStyleDeclaration;
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx"> class EntityReference;
</span><span class="cx"> class Event;
</span><span class="cx"> class EventListener;
</span><ins>+class ExtensionStyleSheets;
</ins><span class="cx"> class FloatRect;
</span><span class="cx"> class FloatQuad;
</span><span class="cx"> class FormController;
</span><span class="lines">@@ -503,7 +504,10 @@
</span><span class="cx"> // This is a DOM function.
</span><span class="cx"> StyleSheetList& styleSheets();
</span><span class="cx">
</span><del>- DocumentStyleSheetCollection& styleSheetCollection() { return m_styleSheetCollection; }
</del><ins>+ AuthorStyleSheets& authorStyleSheets() { return *m_authorStyleSheets; }
+ const AuthorStyleSheets& authorStyleSheets() const { return *m_authorStyleSheets; }
+ ExtensionStyleSheets& extensionStyleSheets() { return *m_extensionStyleSheets; }
+ const ExtensionStyleSheets& extensionStyleSheets() const { return *m_extensionStyleSheets; }
</ins><span class="cx">
</span><span class="cx"> bool gotoAnchorNeededAfterStylesheetsLoad() { return m_gotoAnchorNeededAfterStylesheetsLoad; }
</span><span class="cx"> void setGotoAnchorNeededAfterStylesheetsLoad(bool b) { m_gotoAnchorNeededAfterStylesheetsLoad = b; }
</span><span class="lines">@@ -1459,7 +1463,8 @@
</span><span class="cx">
</span><span class="cx"> MutationObserverOptions m_mutationObserverTypes;
</span><span class="cx">
</span><del>- DocumentStyleSheetCollection m_styleSheetCollection;
</del><ins>+ std::unique_ptr<AuthorStyleSheets> m_authorStyleSheets;
+ std::unique_ptr<ExtensionStyleSheets> m_extensionStyleSheets;
</ins><span class="cx"> RefPtr<StyleSheetList> m_styleSheetList;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<FormController> m_formController;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentStyleSheetCollectioncpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -1,545 +0,0 @@
</span><del>-/*
- * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
- * (C) 1999 Antti Koivisto (koivisto@kde.org)
- * (C) 2001 Dirk Mueller (mueller@kde.org)
- * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
- * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
- * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "DocumentStyleSheetCollection.h"
-
-#include "CSSStyleSheet.h"
-#include "Element.h"
-#include "HTMLIFrameElement.h"
-#include "HTMLLinkElement.h"
-#include "HTMLStyleElement.h"
-#include "InspectorInstrumentation.h"
-#include "Page.h"
-#include "PageGroup.h"
-#include "ProcessingInstruction.h"
-#include "SVGNames.h"
-#include "SVGStyleElement.h"
-#include "Settings.h"
-#include "StyleInvalidationAnalysis.h"
-#include "StyleResolver.h"
-#include "StyleSheetContents.h"
-#include "StyleSheetList.h"
-#include "UserContentController.h"
-#include "UserContentURLPattern.h"
-#include "UserStyleSheet.h"
-
-namespace WebCore {
-
-using namespace ContentExtensions;
-using namespace HTMLNames;
-
-DocumentStyleSheetCollection::DocumentStyleSheetCollection(Document& document)
- : m_document(document)
- , m_pendingStylesheets(0)
- , m_injectedStyleSheetCacheValid(false)
- , m_hadActiveLoadingStylesheet(false)
- , m_pendingUpdateType(NoUpdate)
- , m_usesFirstLineRules(false)
- , m_usesFirstLetterRules(false)
- , m_usesRemUnits(false)
- , m_usesStyleBasedEditability(false)
- , m_styleResolverChangedTimer(*this, &DocumentStyleSheetCollection::styleResolverChangedTimerFired)
-{
-}
-
-void DocumentStyleSheetCollection::combineCSSFeatureFlags()
-{
- // Delay resetting the flags until after next style recalc since unapplying the style may not work without these set (this is true at least with before/after).
- const StyleResolver& styleResolver = m_document.ensureStyleResolver();
- m_usesFirstLineRules = m_usesFirstLineRules || styleResolver.usesFirstLineRules();
- m_usesFirstLetterRules = m_usesFirstLetterRules || styleResolver.usesFirstLetterRules();
-}
-
-void DocumentStyleSheetCollection::resetCSSFeatureFlags()
-{
- const StyleResolver& styleResolver = m_document.ensureStyleResolver();
- m_usesFirstLineRules = styleResolver.usesFirstLineRules();
- m_usesFirstLetterRules = styleResolver.usesFirstLetterRules();
-}
-
-CSSStyleSheet* DocumentStyleSheetCollection::pageUserSheet()
-{
- if (m_pageUserSheet)
- return m_pageUserSheet.get();
-
- Page* owningPage = m_document.page();
- if (!owningPage)
- return 0;
-
- String userSheetText = owningPage->userStyleSheet();
- if (userSheetText.isEmpty())
- return 0;
-
- // Parse the sheet and cache it.
- m_pageUserSheet = CSSStyleSheet::createInline(m_document, m_document.settings()->userStyleSheetLocation());
- m_pageUserSheet->contents().setIsUserStyleSheet(true);
- m_pageUserSheet->contents().parseString(userSheetText);
- return m_pageUserSheet.get();
-}
-
-void DocumentStyleSheetCollection::clearPageUserSheet()
-{
- if (m_pageUserSheet) {
- m_pageUserSheet = nullptr;
- m_document.styleResolverChanged(DeferRecalcStyle);
- }
-}
-
-void DocumentStyleSheetCollection::updatePageUserSheet()
-{
- clearPageUserSheet();
- if (pageUserSheet())
- m_document.styleResolverChanged(RecalcStyleImmediately);
-}
-
-const Vector<RefPtr<CSSStyleSheet>>& DocumentStyleSheetCollection::injectedUserStyleSheets() const
-{
- updateInjectedStyleSheetCache();
- return m_injectedUserStyleSheets;
-}
-
-const Vector<RefPtr<CSSStyleSheet>>& DocumentStyleSheetCollection::injectedAuthorStyleSheets() const
-{
- updateInjectedStyleSheetCache();
- return m_injectedAuthorStyleSheets;
-}
-
-void DocumentStyleSheetCollection::updateInjectedStyleSheetCache() const
-{
- if (m_injectedStyleSheetCacheValid)
- return;
- m_injectedStyleSheetCacheValid = true;
- m_injectedUserStyleSheets.clear();
- m_injectedAuthorStyleSheets.clear();
-
- Page* owningPage = m_document.page();
- if (!owningPage)
- return;
-
- const auto* userContentController = owningPage->userContentController();
- if (!userContentController)
- return;
-
- const UserStyleSheetMap* userStyleSheets = userContentController->userStyleSheets();
- if (!userStyleSheets)
- return;
-
- for (auto& styleSheets : userStyleSheets->values()) {
- for (const auto& sheet : *styleSheets) {
- if (sheet->injectedFrames() == InjectInTopFrameOnly && m_document.ownerElement())
- continue;
-
- if (!UserContentURLPattern::matchesPatterns(m_document.url(), sheet->whitelist(), sheet->blacklist()))
- continue;
-
- RefPtr<CSSStyleSheet> groupSheet = CSSStyleSheet::createInline(const_cast<Document&>(m_document), sheet->url());
- bool isUserStyleSheet = sheet->level() == UserStyleUserLevel;
- if (isUserStyleSheet)
- m_injectedUserStyleSheets.append(groupSheet);
- else
- m_injectedAuthorStyleSheets.append(groupSheet);
-
- groupSheet->contents().setIsUserStyleSheet(isUserStyleSheet);
- groupSheet->contents().parseString(sheet->source());
- }
- }
-}
-
-void DocumentStyleSheetCollection::invalidateInjectedStyleSheetCache()
-{
- if (!m_injectedStyleSheetCacheValid)
- return;
- m_injectedStyleSheetCacheValid = false;
- if (m_injectedUserStyleSheets.isEmpty() && m_injectedAuthorStyleSheets.isEmpty())
- return;
- m_document.styleResolverChanged(DeferRecalcStyle);
-}
-
-void DocumentStyleSheetCollection::addAuthorSheet(Ref<StyleSheetContents>&& authorSheet)
-{
- ASSERT(!authorSheet.get().isUserStyleSheet());
- m_authorStyleSheets.append(CSSStyleSheet::create(WTF::move(authorSheet), &m_document));
- m_document.styleResolverChanged(RecalcStyleImmediately);
-}
-
-void DocumentStyleSheetCollection::addUserSheet(Ref<StyleSheetContents>&& userSheet)
-{
- ASSERT(userSheet.get().isUserStyleSheet());
- m_userStyleSheets.append(CSSStyleSheet::create(WTF::move(userSheet), &m_document));
- m_document.styleResolverChanged(RecalcStyleImmediately);
-}
-
-#if ENABLE(CONTENT_EXTENSIONS)
-void DocumentStyleSheetCollection::addDisplayNoneSelector(const String& identifier, const String& selector, uint32_t selectorID)
-{
- auto result = m_contentExtensionSelectorSheets.add(identifier, nullptr);
- if (result.isNewEntry) {
- result.iterator->value = ContentExtensionStyleSheet::create(m_document);
- m_userStyleSheets.append(&result.iterator->value->styleSheet());
- }
-
- result.iterator->value->addDisplayNoneSelector(selector, selectorID);
- m_styleResolverChangedTimer.startOneShot(0);
-}
-
-void DocumentStyleSheetCollection::maybeAddContentExtensionSheet(const String& identifier, StyleSheetContents& sheet)
-{
- ASSERT(sheet.isUserStyleSheet());
-
- if (m_contentExtensionSheets.contains(identifier))
- return;
-
- Ref<CSSStyleSheet> cssSheet = CSSStyleSheet::create(sheet, &m_document);
- m_contentExtensionSheets.set(identifier, &cssSheet.get());
- m_userStyleSheets.append(adoptRef(cssSheet.leakRef()));
- m_styleResolverChangedTimer.startOneShot(0);
-}
-#endif // ENABLE(CONTENT_EXTENSIONS)
-
-void DocumentStyleSheetCollection::styleResolverChangedTimerFired()
-{
- m_document.styleResolverChanged(RecalcStyleImmediately);
-}
-
-// This method is called whenever a top-level stylesheet has finished loading.
-void DocumentStyleSheetCollection::removePendingSheet(RemovePendingSheetNotificationType notification)
-{
- // Make sure we knew this sheet was pending, and that our count isn't out of sync.
- ASSERT(m_pendingStylesheets > 0);
-
- m_pendingStylesheets--;
-
-#ifdef INSTRUMENT_LAYOUT_SCHEDULING
- if (!ownerElement())
- printf("Stylesheet loaded at time %d. %d stylesheets still remain.\n", elapsedTime(), m_pendingStylesheets);
-#endif
-
- if (m_pendingStylesheets)
- return;
-
- if (notification == RemovePendingSheetNotifyLater) {
- m_document.setNeedsNotifyRemoveAllPendingStylesheet();
- return;
- }
-
- m_document.didRemoveAllPendingStylesheet();
-}
-
-void DocumentStyleSheetCollection::addStyleSheetCandidateNode(Node& node, bool createdByParser)
-{
- if (!node.inDocument())
- return;
-
- // Until the <body> exists, we have no choice but to compare document positions,
- // since styles outside of the body and head continue to be shunted into the head
- // (and thus can shift to end up before dynamically added DOM content that is also
- // outside the body).
- if ((createdByParser && m_document.bodyOrFrameset()) || m_styleSheetCandidateNodes.isEmpty()) {
- m_styleSheetCandidateNodes.add(&node);
- return;
- }
-
- // Determine an appropriate insertion point.
- StyleSheetCandidateListHashSet::iterator begin = m_styleSheetCandidateNodes.begin();
- StyleSheetCandidateListHashSet::iterator end = m_styleSheetCandidateNodes.end();
- StyleSheetCandidateListHashSet::iterator it = end;
- Node* followingNode = 0;
- do {
- --it;
- Node* n = *it;
- unsigned short position = n->compareDocumentPosition(&node);
- if (position == Node::DOCUMENT_POSITION_FOLLOWING) {
- m_styleSheetCandidateNodes.insertBefore(followingNode, &node);
- return;
- }
- followingNode = n;
- } while (it != begin);
-
- m_styleSheetCandidateNodes.insertBefore(followingNode, &node);
-}
-
-void DocumentStyleSheetCollection::removeStyleSheetCandidateNode(Node& node)
-{
- m_styleSheetCandidateNodes.remove(&node);
-}
-
-void DocumentStyleSheetCollection::collectActiveStyleSheets(Vector<RefPtr<StyleSheet>>& sheets)
-{
- if (m_document.settings() && !m_document.settings()->authorAndUserStylesEnabled())
- return;
-
- for (auto& node : m_styleSheetCandidateNodes) {
- StyleSheet* sheet = nullptr;
- if (is<ProcessingInstruction>(*node)) {
- // Processing instruction (XML documents only).
- // We don't support linking to embedded CSS stylesheets, see <https://bugs.webkit.org/show_bug.cgi?id=49281> for discussion.
- ProcessingInstruction& pi = downcast<ProcessingInstruction>(*node);
- sheet = pi.sheet();
-#if ENABLE(XSLT)
- // Don't apply XSL transforms to already transformed documents -- <rdar://problem/4132806>
- if (pi.isXSL() && !m_document.transformSourceDocument()) {
- // Don't apply XSL transforms until loading is finished.
- if (!m_document.parsing())
- m_document.applyXSLTransform(&pi);
- return;
- }
-#endif
- } else if (is<HTMLLinkElement>(*node) || is<HTMLStyleElement>(*node) || is<SVGStyleElement>(*node)) {
- Element& element = downcast<Element>(*node);
- AtomicString title = element.fastGetAttribute(titleAttr);
- bool enabledViaScript = false;
- if (is<HTMLLinkElement>(element)) {
- // <LINK> element
- HTMLLinkElement& linkElement = downcast<HTMLLinkElement>(element);
- if (linkElement.isDisabled())
- continue;
- enabledViaScript = linkElement.isEnabledViaScript();
- if (linkElement.styleSheetIsLoading()) {
- // it is loading but we should still decide which style sheet set to use
- if (!enabledViaScript && !title.isEmpty() && m_preferredStylesheetSetName.isEmpty()) {
- if (!linkElement.fastGetAttribute(relAttr).contains("alternate")) {
- m_preferredStylesheetSetName = title;
- m_selectedStylesheetSetName = title;
- }
- }
- continue;
- }
- if (!linkElement.sheet())
- title = nullAtom;
- }
- // Get the current preferred styleset. This is the
- // set of sheets that will be enabled.
- if (is<SVGStyleElement>(element))
- sheet = downcast<SVGStyleElement>(element).sheet();
- else if (is<HTMLLinkElement>(element))
- sheet = downcast<HTMLLinkElement>(element).sheet();
- else
- sheet = downcast<HTMLStyleElement>(element).sheet();
- // Check to see if this sheet belongs to a styleset
- // (thus making it PREFERRED or ALTERNATE rather than
- // PERSISTENT).
- auto& rel = element.fastGetAttribute(relAttr);
- if (!enabledViaScript && !title.isEmpty()) {
- // Yes, we have a title.
- if (m_preferredStylesheetSetName.isEmpty()) {
- // No preferred set has been established. If
- // we are NOT an alternate sheet, then establish
- // us as the preferred set. Otherwise, just ignore
- // this sheet.
- if (is<HTMLStyleElement>(element) || !rel.contains("alternate"))
- m_preferredStylesheetSetName = m_selectedStylesheetSetName = title;
- }
- if (title != m_preferredStylesheetSetName)
- sheet = nullptr;
- }
-
- if (rel.contains("alternate") && title.isEmpty())
- sheet = nullptr;
- }
- if (sheet)
- sheets.append(sheet);
- }
-}
-
-void DocumentStyleSheetCollection::analyzeStyleSheetChange(UpdateFlag updateFlag, const Vector<RefPtr<CSSStyleSheet>>& newStylesheets, StyleResolverUpdateType& styleResolverUpdateType, bool& requiresFullStyleRecalc)
-{
- styleResolverUpdateType = Reconstruct;
- requiresFullStyleRecalc = true;
-
- // Stylesheets of <style> elements that @import stylesheets are active but loading. We need to trigger a full recalc when such loads are done.
- bool hasActiveLoadingStylesheet = false;
- unsigned newStylesheetCount = newStylesheets.size();
- for (unsigned i = 0; i < newStylesheetCount; ++i) {
- if (newStylesheets[i]->isLoading())
- hasActiveLoadingStylesheet = true;
- }
- if (m_hadActiveLoadingStylesheet && !hasActiveLoadingStylesheet) {
- m_hadActiveLoadingStylesheet = false;
- return;
- }
- m_hadActiveLoadingStylesheet = hasActiveLoadingStylesheet;
-
- if (updateFlag != OptimizedUpdate)
- return;
- if (!m_document.styleResolverIfExists())
- return;
- StyleResolver& styleResolver = *m_document.styleResolverIfExists();
-
- // Find out which stylesheets are new.
- unsigned oldStylesheetCount = m_activeAuthorStyleSheets.size();
- if (newStylesheetCount < oldStylesheetCount)
- return;
- Vector<StyleSheetContents*> addedSheets;
- unsigned newIndex = 0;
- for (unsigned oldIndex = 0; oldIndex < oldStylesheetCount; ++oldIndex) {
- if (newIndex >= newStylesheetCount)
- return;
- while (m_activeAuthorStyleSheets[oldIndex] != newStylesheets[newIndex]) {
- addedSheets.append(&newStylesheets[newIndex]->contents());
- ++newIndex;
- if (newIndex == newStylesheetCount)
- return;
- }
- ++newIndex;
- }
- bool hasInsertions = !addedSheets.isEmpty();
- while (newIndex < newStylesheetCount) {
- addedSheets.append(&newStylesheets[newIndex]->contents());
- ++newIndex;
- }
- // If all new sheets were added at the end of the list we can just add them to existing StyleResolver.
- // If there were insertions we need to re-add all the stylesheets so rules are ordered correctly.
- styleResolverUpdateType = hasInsertions ? Reset : Additive;
-
- // If we are already parsing the body and so may have significant amount of elements, put some effort into trying to avoid style recalcs.
- if (!m_document.bodyOrFrameset() || m_document.hasNodesWithPlaceholderStyle())
- return;
- StyleInvalidationAnalysis invalidationAnalysis(addedSheets, styleResolver.mediaQueryEvaluator());
- if (invalidationAnalysis.dirtiesAllStyle())
- return;
- invalidationAnalysis.invalidateStyle(m_document);
- requiresFullStyleRecalc = false;
-}
-
-static void filterEnabledNonemptyCSSStyleSheets(Vector<RefPtr<CSSStyleSheet>>& result, const Vector<RefPtr<StyleSheet>>& sheets)
-{
- for (unsigned i = 0; i < sheets.size(); ++i) {
- if (!is<CSSStyleSheet>(*sheets[i]))
- continue;
- CSSStyleSheet& sheet = downcast<CSSStyleSheet>(*sheets[i]);
- if (sheet.disabled())
- continue;
- if (!sheet.length())
- continue;
- result.append(&sheet);
- }
-}
-
-bool DocumentStyleSheetCollection::updateActiveStyleSheets(UpdateFlag updateFlag)
-{
- if (m_document.inStyleRecalc()) {
- // SVG <use> element may manage to invalidate style selector in the middle of a style recalc.
- // https://bugs.webkit.org/show_bug.cgi?id=54344
- // FIXME: This should be fixed in SVG and the call site replaced by ASSERT(!m_inStyleRecalc).
- m_pendingUpdateType = FullUpdate;
- m_document.scheduleForcedStyleRecalc();
- return false;
-
- }
- if (!m_document.hasLivingRenderTree())
- return false;
-
- Vector<RefPtr<StyleSheet>> activeStyleSheets;
- collectActiveStyleSheets(activeStyleSheets);
-
- Vector<RefPtr<CSSStyleSheet>> activeCSSStyleSheets;
- activeCSSStyleSheets.appendVector(injectedAuthorStyleSheets());
- activeCSSStyleSheets.appendVector(documentAuthorStyleSheets());
- filterEnabledNonemptyCSSStyleSheets(activeCSSStyleSheets, activeStyleSheets);
-
- StyleResolverUpdateType styleResolverUpdateType;
- bool requiresFullStyleRecalc;
- analyzeStyleSheetChange(updateFlag, activeCSSStyleSheets, styleResolverUpdateType, requiresFullStyleRecalc);
-
- if (styleResolverUpdateType == Reconstruct)
- m_document.clearStyleResolver();
- else {
- StyleResolver& styleResolver = m_document.ensureStyleResolver();
- if (styleResolverUpdateType == Reset) {
- styleResolver.ruleSets().resetAuthorStyle();
- styleResolver.appendAuthorStyleSheets(0, activeCSSStyleSheets);
- } else {
- ASSERT(styleResolverUpdateType == Additive);
- styleResolver.appendAuthorStyleSheets(m_activeAuthorStyleSheets.size(), activeCSSStyleSheets);
- }
- resetCSSFeatureFlags();
- }
-
- m_weakCopyOfActiveStyleSheetListForFastLookup = nullptr;
- m_activeAuthorStyleSheets.swap(activeCSSStyleSheets);
- m_styleSheetsForStyleSheetList.swap(activeStyleSheets);
-
- InspectorInstrumentation::activeStyleSheetsUpdated(m_document);
-
- for (const auto& sheet : m_activeAuthorStyleSheets) {
- if (sheet->contents().usesRemUnits())
- m_usesRemUnits = true;
- if (sheet->contents().usesStyleBasedEditability())
- m_usesStyleBasedEditability = true;
- }
- m_pendingUpdateType = NoUpdate;
-
- return requiresFullStyleRecalc;
-}
-
-const Vector<RefPtr<CSSStyleSheet>> DocumentStyleSheetCollection::activeStyleSheetsForInspector() const
-{
- Vector<RefPtr<CSSStyleSheet>> result;
-
- result.appendVector(injectedAuthorStyleSheets());
- result.appendVector(documentAuthorStyleSheets());
-
- for (auto& styleSheet : m_styleSheetsForStyleSheetList) {
- if (!is<CSSStyleSheet>(*styleSheet))
- continue;
-
- CSSStyleSheet& sheet = downcast<CSSStyleSheet>(*styleSheet);
- if (sheet.disabled())
- continue;
-
- result.append(&sheet);
- }
-
- return result;
-}
-
-bool DocumentStyleSheetCollection::activeStyleSheetsContains(const CSSStyleSheet* sheet) const
-{
- if (!m_weakCopyOfActiveStyleSheetListForFastLookup) {
- m_weakCopyOfActiveStyleSheetListForFastLookup = std::make_unique<HashSet<const CSSStyleSheet*>>();
- for (unsigned i = 0; i < m_activeAuthorStyleSheets.size(); ++i)
- m_weakCopyOfActiveStyleSheetListForFastLookup->add(m_activeAuthorStyleSheets[i].get());
- }
- return m_weakCopyOfActiveStyleSheetListForFastLookup->contains(sheet);
-}
-
-void DocumentStyleSheetCollection::detachFromDocument()
-{
- if (m_pageUserSheet)
- m_pageUserSheet->detachFromDocument();
- for (unsigned i = 0; i < m_injectedUserStyleSheets.size(); ++i)
- m_injectedUserStyleSheets[i]->detachFromDocument();
- for (unsigned i = 0; i < m_injectedAuthorStyleSheets.size(); ++i)
- m_injectedAuthorStyleSheets[i]->detachFromDocument();
- for (unsigned i = 0; i < m_userStyleSheets.size(); ++i)
- m_userStyleSheets[i]->detachFromDocument();
- for (unsigned i = 0; i < m_authorStyleSheets.size(); ++i)
- m_authorStyleSheets[i]->detachFromDocument();
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoredomDocumentStyleSheetCollectionh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/dom/DocumentStyleSheetCollection.h (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentStyleSheetCollection.h 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/dom/DocumentStyleSheetCollection.h 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -1,190 +0,0 @@
</span><del>-/*
- * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
- * (C) 1999 Antti Koivisto (koivisto@kde.org)
- * (C) 2001 Dirk Mueller (mueller@kde.org)
- * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
- * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef DocumentStyleSheetCollection_h
-#define DocumentStyleSheetCollection_h
-
-#include "Timer.h"
-#include <memory>
-#include <wtf/FastMalloc.h>
-#include <wtf/HashMap.h>
-#include <wtf/ListHashSet.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
-#include <wtf/text/WTFString.h>
-
-#if ENABLE(CONTENT_EXTENSIONS)
-#include "ContentExtensionStyleSheet.h"
-#endif
-
-namespace WebCore {
-
-class CSSStyleSheet;
-class Document;
-class Node;
-class StyleSheet;
-class StyleSheetContents;
-class StyleSheetList;
-
-class DocumentStyleSheetCollection {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- explicit DocumentStyleSheetCollection(Document&);
-
- const Vector<RefPtr<StyleSheet>>& styleSheetsForStyleSheetList() const { return m_styleSheetsForStyleSheetList; }
-
- const Vector<RefPtr<CSSStyleSheet>>& activeAuthorStyleSheets() const { return m_activeAuthorStyleSheets; }
-
- const Vector<RefPtr<CSSStyleSheet>> activeStyleSheetsForInspector() const;
-
- CSSStyleSheet* pageUserSheet();
- const Vector<RefPtr<CSSStyleSheet>>& documentUserStyleSheets() const { return m_userStyleSheets; }
- const Vector<RefPtr<CSSStyleSheet>>& documentAuthorStyleSheets() const { return m_authorStyleSheets; }
- const Vector<RefPtr<CSSStyleSheet>>& injectedUserStyleSheets() const;
- const Vector<RefPtr<CSSStyleSheet>>& injectedAuthorStyleSheets() const;
-
- void addStyleSheetCandidateNode(Node&, bool createdByParser);
- void removeStyleSheetCandidateNode(Node&);
-
- void clearPageUserSheet();
- void updatePageUserSheet();
- void invalidateInjectedStyleSheetCache();
- void updateInjectedStyleSheetCache() const;
-
- WEBCORE_EXPORT void addAuthorSheet(Ref<StyleSheetContents>&& authorSheet);
- WEBCORE_EXPORT void addUserSheet(Ref<StyleSheetContents>&& userSheet);
-
-#if ENABLE(CONTENT_EXTENSIONS)
- void addDisplayNoneSelector(const String& identifier, const String& selector, uint32_t selectorID);
- void maybeAddContentExtensionSheet(const String& identifier, StyleSheetContents&);
-#endif
-
- enum UpdateFlag { NoUpdate = 0, OptimizedUpdate, FullUpdate };
-
- UpdateFlag pendingUpdateType() const { return m_pendingUpdateType; }
- void setPendingUpdateType(UpdateFlag updateType)
- {
- if (updateType > m_pendingUpdateType)
- m_pendingUpdateType = updateType;
- }
-
- void flushPendingUpdates()
- {
- if (m_pendingUpdateType != NoUpdate)
- updateActiveStyleSheets(m_pendingUpdateType);
- }
-
- bool updateActiveStyleSheets(UpdateFlag);
-
- String preferredStylesheetSetName() const { return m_preferredStylesheetSetName; }
- String selectedStylesheetSetName() const { return m_selectedStylesheetSetName; }
- void setPreferredStylesheetSetName(const String& name) { m_preferredStylesheetSetName = name; }
- void setSelectedStylesheetSetName(const String& name) { m_selectedStylesheetSetName = name; }
-
- void addPendingSheet() { m_pendingStylesheets++; }
- enum RemovePendingSheetNotificationType {
- RemovePendingSheetNotifyImmediately,
- RemovePendingSheetNotifyLater
- };
- void removePendingSheet(RemovePendingSheetNotificationType = RemovePendingSheetNotifyImmediately);
-
- bool hasPendingSheets() const { return m_pendingStylesheets > 0; }
-
- bool usesFirstLineRules() const { return m_usesFirstLineRules; }
- bool usesFirstLetterRules() const { return m_usesFirstLetterRules; }
- bool usesRemUnits() const { return m_usesRemUnits; }
- void setUsesRemUnit(bool b) { m_usesRemUnits = b; }
- bool usesStyleBasedEditability() { return m_usesStyleBasedEditability; }
- void setUsesStyleBasedEditability(bool b) { m_usesStyleBasedEditability = b; }
-
- void combineCSSFeatureFlags();
- void resetCSSFeatureFlags();
-
- bool activeStyleSheetsContains(const CSSStyleSheet*) const;
-
- void detachFromDocument();
-
-private:
- void collectActiveStyleSheets(Vector<RefPtr<StyleSheet>>&);
- enum StyleResolverUpdateType {
- Reconstruct,
- Reset,
- Additive
- };
- void analyzeStyleSheetChange(UpdateFlag, const Vector<RefPtr<CSSStyleSheet>>& newStylesheets, StyleResolverUpdateType&, bool& requiresFullStyleRecalc);
-
- void styleResolverChangedTimerFired();
-
- Document& m_document;
-
- Vector<RefPtr<StyleSheet>> m_styleSheetsForStyleSheetList;
- Vector<RefPtr<CSSStyleSheet>> m_activeAuthorStyleSheets;
-
- // This is a mirror of m_activeAuthorStyleSheets that gets populated on demand for activeStyleSheetsContains().
- mutable std::unique_ptr<HashSet<const CSSStyleSheet*>> m_weakCopyOfActiveStyleSheetListForFastLookup;
-
- // Track the number of currently loading top-level stylesheets needed for rendering.
- // Sheets loaded using the @import directive are not included in this count.
- // We use this count of pending sheets to detect when we can begin attaching
- // elements and when it is safe to execute scripts.
- int m_pendingStylesheets;
-
- RefPtr<CSSStyleSheet> m_pageUserSheet;
-
- mutable Vector<RefPtr<CSSStyleSheet>> m_injectedUserStyleSheets;
- mutable Vector<RefPtr<CSSStyleSheet>> m_injectedAuthorStyleSheets;
- mutable bool m_injectedStyleSheetCacheValid;
-
- Vector<RefPtr<CSSStyleSheet>> m_userStyleSheets;
- Vector<RefPtr<CSSStyleSheet>> m_authorStyleSheets;
-
-#if ENABLE(CONTENT_EXTENSIONS)
- HashMap<String, RefPtr<CSSStyleSheet>> m_contentExtensionSheets;
- HashMap<String, RefPtr<ContentExtensions::ContentExtensionStyleSheet>> m_contentExtensionSelectorSheets;
-#endif
-
- bool m_hadActiveLoadingStylesheet;
- UpdateFlag m_pendingUpdateType;
-
- typedef ListHashSet<Node*> StyleSheetCandidateListHashSet;
- StyleSheetCandidateListHashSet m_styleSheetCandidateNodes;
-
- String m_preferredStylesheetSetName;
- String m_selectedStylesheetSetName;
-
- bool m_usesFirstLineRules;
- bool m_usesFirstLetterRules;
- bool m_usesRemUnits;
- bool m_usesStyleBasedEditability;
-
- Timer m_styleResolverChangedTimer;
-};
-
-}
-
-#endif
-
</del></span></pre></div>
<a id="trunkSourceWebCoredomExtensionStyleSheetscppfromrev190074trunkSourceWebCoredomDocumentStyleSheetCollectioncpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/dom/ExtensionStyleSheets.cpp (from rev 190074, trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp) (0 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ExtensionStyleSheets.cpp (rev 0)
+++ trunk/Source/WebCore/dom/ExtensionStyleSheets.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -0,0 +1,220 @@
</span><ins>+/*
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ * (C) 1999 Antti Koivisto (koivisto@kde.org)
+ * (C) 2001 Dirk Mueller (mueller@kde.org)
+ * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
+ * Copyright (C) 2004-2009, 2011-2012, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
+ * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+#include "ExtensionStyleSheets.h"
+
+#include "CSSStyleSheet.h"
+#include "Element.h"
+#include "HTMLIFrameElement.h"
+#include "HTMLLinkElement.h"
+#include "HTMLStyleElement.h"
+#include "InspectorInstrumentation.h"
+#include "Page.h"
+#include "PageGroup.h"
+#include "ProcessingInstruction.h"
+#include "SVGNames.h"
+#include "SVGStyleElement.h"
+#include "Settings.h"
+#include "StyleInvalidationAnalysis.h"
+#include "StyleResolver.h"
+#include "StyleSheetContents.h"
+#include "StyleSheetList.h"
+#include "UserContentController.h"
+#include "UserContentURLPattern.h"
+#include "UserStyleSheet.h"
+
+namespace WebCore {
+
+using namespace ContentExtensions;
+using namespace HTMLNames;
+
+ExtensionStyleSheets::ExtensionStyleSheets(Document& document)
+ : m_document(document)
+ , m_styleResolverChangedTimer(*this, &ExtensionStyleSheets::styleResolverChangedTimerFired)
+{
+}
+
+CSSStyleSheet* ExtensionStyleSheets::pageUserSheet()
+{
+ if (m_pageUserSheet)
+ return m_pageUserSheet.get();
+
+ Page* owningPage = m_document.page();
+ if (!owningPage)
+ return 0;
+
+ String userSheetText = owningPage->userStyleSheet();
+ if (userSheetText.isEmpty())
+ return 0;
+
+ // Parse the sheet and cache it.
+ m_pageUserSheet = CSSStyleSheet::createInline(m_document, m_document.settings()->userStyleSheetLocation());
+ m_pageUserSheet->contents().setIsUserStyleSheet(true);
+ m_pageUserSheet->contents().parseString(userSheetText);
+ return m_pageUserSheet.get();
+}
+
+void ExtensionStyleSheets::clearPageUserSheet()
+{
+ if (m_pageUserSheet) {
+ m_pageUserSheet = nullptr;
+ m_document.styleResolverChanged(DeferRecalcStyle);
+ }
+}
+
+void ExtensionStyleSheets::updatePageUserSheet()
+{
+ clearPageUserSheet();
+ if (pageUserSheet())
+ m_document.styleResolverChanged(RecalcStyleImmediately);
+}
+
+const Vector<RefPtr<CSSStyleSheet>>& ExtensionStyleSheets::injectedUserStyleSheets() const
+{
+ updateInjectedStyleSheetCache();
+ return m_injectedUserStyleSheets;
+}
+
+const Vector<RefPtr<CSSStyleSheet>>& ExtensionStyleSheets::injectedAuthorStyleSheets() const
+{
+ updateInjectedStyleSheetCache();
+ return m_injectedAuthorStyleSheets;
+}
+
+void ExtensionStyleSheets::updateInjectedStyleSheetCache() const
+{
+ if (m_injectedStyleSheetCacheValid)
+ return;
+ m_injectedStyleSheetCacheValid = true;
+ m_injectedUserStyleSheets.clear();
+ m_injectedAuthorStyleSheets.clear();
+
+ Page* owningPage = m_document.page();
+ if (!owningPage)
+ return;
+
+ const auto* userContentController = owningPage->userContentController();
+ if (!userContentController)
+ return;
+
+ const UserStyleSheetMap* userStyleSheets = userContentController->userStyleSheets();
+ if (!userStyleSheets)
+ return;
+
+ for (auto& styleSheets : userStyleSheets->values()) {
+ for (const auto& sheet : *styleSheets) {
+ if (sheet->injectedFrames() == InjectInTopFrameOnly && m_document.ownerElement())
+ continue;
+
+ if (!UserContentURLPattern::matchesPatterns(m_document.url(), sheet->whitelist(), sheet->blacklist()))
+ continue;
+
+ RefPtr<CSSStyleSheet> groupSheet = CSSStyleSheet::createInline(const_cast<Document&>(m_document), sheet->url());
+ bool isUserStyleSheet = sheet->level() == UserStyleUserLevel;
+ if (isUserStyleSheet)
+ m_injectedUserStyleSheets.append(groupSheet);
+ else
+ m_injectedAuthorStyleSheets.append(groupSheet);
+
+ groupSheet->contents().setIsUserStyleSheet(isUserStyleSheet);
+ groupSheet->contents().parseString(sheet->source());
+ }
+ }
+}
+
+void ExtensionStyleSheets::invalidateInjectedStyleSheetCache()
+{
+ if (!m_injectedStyleSheetCacheValid)
+ return;
+ m_injectedStyleSheetCacheValid = false;
+ if (m_injectedUserStyleSheets.isEmpty() && m_injectedAuthorStyleSheets.isEmpty())
+ return;
+ m_document.styleResolverChanged(DeferRecalcStyle);
+}
+
+void ExtensionStyleSheets::addUserStyleSheet(Ref<StyleSheetContents>&& userSheet)
+{
+ ASSERT(userSheet.get().isUserStyleSheet());
+ m_userStyleSheets.append(CSSStyleSheet::create(WTF::move(userSheet), &m_document));
+ m_document.styleResolverChanged(RecalcStyleImmediately);
+}
+
+void ExtensionStyleSheets::addAuthorStyleSheetForTesting(Ref<StyleSheetContents>&& authorSheet)
+{
+ ASSERT(!authorSheet.get().isUserStyleSheet());
+ m_authorStyleSheetsForTesting.append(CSSStyleSheet::create(WTF::move(authorSheet), &m_document));
+ m_document.styleResolverChanged(RecalcStyleImmediately);
+}
+
+#if ENABLE(CONTENT_EXTENSIONS)
+void ExtensionStyleSheets::addDisplayNoneSelector(const String& identifier, const String& selector, uint32_t selectorID)
+{
+ auto result = m_contentExtensionSelectorSheets.add(identifier, nullptr);
+ if (result.isNewEntry) {
+ result.iterator->value = ContentExtensionStyleSheet::create(m_document);
+ m_userStyleSheets.append(&result.iterator->value->styleSheet());
+ }
+
+ result.iterator->value->addDisplayNoneSelector(selector, selectorID);
+ m_styleResolverChangedTimer.startOneShot(0);
+}
+
+void ExtensionStyleSheets::maybeAddContentExtensionSheet(const String& identifier, StyleSheetContents& sheet)
+{
+ ASSERT(sheet.isUserStyleSheet());
+
+ if (m_contentExtensionSheets.contains(identifier))
+ return;
+
+ Ref<CSSStyleSheet> cssSheet = CSSStyleSheet::create(sheet, &m_document);
+ m_contentExtensionSheets.set(identifier, &cssSheet.get());
+ m_userStyleSheets.append(adoptRef(cssSheet.leakRef()));
+ m_styleResolverChangedTimer.startOneShot(0);
+}
+#endif // ENABLE(CONTENT_EXTENSIONS)
+
+void ExtensionStyleSheets::styleResolverChangedTimerFired()
+{
+ m_document.styleResolverChanged(RecalcStyleImmediately);
+}
+
+void ExtensionStyleSheets::detachFromDocument()
+{
+ if (m_pageUserSheet)
+ m_pageUserSheet->detachFromDocument();
+ for (auto& sheet : m_injectedUserStyleSheets)
+ sheet->detachFromDocument();
+ for (auto& sheet : m_injectedAuthorStyleSheets)
+ sheet->detachFromDocument();
+ for (auto& sheet : m_userStyleSheets)
+ sheet->detachFromDocument();
+ for (auto& sheet : m_authorStyleSheetsForTesting)
+ sheet->detachFromDocument();
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoredomExtensionStyleSheetshfromrev190074trunkSourceWebCoredomDocumentStyleSheetCollectionh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/dom/ExtensionStyleSheets.h (from rev 190074, trunk/Source/WebCore/dom/DocumentStyleSheetCollection.h) (0 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ExtensionStyleSheets.h (rev 0)
+++ trunk/Source/WebCore/dom/ExtensionStyleSheets.h 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -0,0 +1,105 @@
</span><ins>+/*
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ * (C) 1999 Antti Koivisto (koivisto@kde.org)
+ * (C) 2001 Dirk Mueller (mueller@kde.org)
+ * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
+ * Copyright (C) 2004-2010, 2012-2013, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ExtensionStyleSheets_h
+#define ExtensionStyleSheets_h
+
+#include "Timer.h"
+#include <memory>
+#include <wtf/FastMalloc.h>
+#include <wtf/HashMap.h>
+#include <wtf/ListHashSet.h>
+#include <wtf/RefPtr.h>
+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
+
+#if ENABLE(CONTENT_EXTENSIONS)
+#include "ContentExtensionStyleSheet.h"
+#endif
+
+namespace WebCore {
+
+class CSSStyleSheet;
+class Document;
+class Node;
+class StyleSheet;
+class StyleSheetContents;
+class StyleSheetList;
+
+class ExtensionStyleSheets {
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ explicit ExtensionStyleSheets(Document&);
+
+ CSSStyleSheet* pageUserSheet();
+ const Vector<RefPtr<CSSStyleSheet>>& documentUserStyleSheets() const { return m_userStyleSheets; }
+ const Vector<RefPtr<CSSStyleSheet>>& injectedUserStyleSheets() const;
+ const Vector<RefPtr<CSSStyleSheet>>& injectedAuthorStyleSheets() const;
+ const Vector<RefPtr<CSSStyleSheet>>& authorStyleSheetsForTesting() const { return m_authorStyleSheetsForTesting; }
+
+ void clearPageUserSheet();
+ void updatePageUserSheet();
+ void invalidateInjectedStyleSheetCache();
+ void updateInjectedStyleSheetCache() const;
+
+ WEBCORE_EXPORT void addUserStyleSheet(Ref<StyleSheetContents>&&);
+
+ WEBCORE_EXPORT void addAuthorStyleSheetForTesting(Ref<StyleSheetContents>&&);
+
+#if ENABLE(CONTENT_EXTENSIONS)
+ void addDisplayNoneSelector(const String& identifier, const String& selector, uint32_t selectorID);
+ void maybeAddContentExtensionSheet(const String& identifier, StyleSheetContents&);
+#endif
+
+ void detachFromDocument();
+
+private:
+ void styleResolverChangedTimerFired();
+
+ Document& m_document;
+
+ RefPtr<CSSStyleSheet> m_pageUserSheet;
+
+ mutable Vector<RefPtr<CSSStyleSheet>> m_injectedUserStyleSheets;
+ mutable Vector<RefPtr<CSSStyleSheet>> m_injectedAuthorStyleSheets;
+ mutable bool m_injectedStyleSheetCacheValid { false };
+
+ Vector<RefPtr<CSSStyleSheet>> m_userStyleSheets;
+ Vector<RefPtr<CSSStyleSheet>> m_authorStyleSheetsForTesting;
+
+#if ENABLE(CONTENT_EXTENSIONS)
+ HashMap<String, RefPtr<CSSStyleSheet>> m_contentExtensionSheets;
+ HashMap<String, RefPtr<ContentExtensions::ContentExtensionStyleSheet>> m_contentExtensionSelectorSheets;
+#endif
+
+ Timer m_styleResolverChangedTimer;
+};
+
+}
+
+#endif
+
</ins></span></pre></div>
<a id="trunkSourceWebCoredomInlineStyleSheetOwnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InlineStyleSheetOwner.h"
</span><span class="cx">
</span><ins>+#include "AuthorStyleSheets.h"
</ins><span class="cx"> #include "ContentSecurityPolicy.h"
</span><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "MediaList.h"
</span><span class="lines">@@ -47,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> void InlineStyleSheetOwner::insertedIntoDocument(Document& document, Element& element)
</span><span class="cx"> {
</span><del>- document.styleSheetCollection().addStyleSheetCandidateNode(element, m_isParsingChildren);
</del><ins>+ document.authorStyleSheets().addStyleSheetCandidateNode(element, m_isParsingChildren);
</ins><span class="cx">
</span><span class="cx"> if (m_isParsingChildren)
</span><span class="cx"> return;
</span><span class="lines">@@ -56,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> void InlineStyleSheetOwner::removedFromDocument(Document& document, Element& element)
</span><span class="cx"> {
</span><del>- document.styleSheetCollection().removeStyleSheetCandidateNode(element);
</del><ins>+ document.authorStyleSheets().removeStyleSheetCandidateNode(element);
</ins><span class="cx">
</span><span class="cx"> if (m_sheet)
</span><span class="cx"> clearSheet();
</span><span class="lines">@@ -73,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> if (!element.inDocument())
</span><span class="cx"> return;
</span><del>- document.styleSheetCollection().removeStyleSheetCandidateNode(element);
</del><ins>+ document.authorStyleSheets().removeStyleSheetCandidateNode(element);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InlineStyleSheetOwner::childrenChanged(Element& element)
</span><span class="lines">@@ -117,7 +118,7 @@
</span><span class="cx"> Document& document = element.document();
</span><span class="cx"> if (m_sheet) {
</span><span class="cx"> if (m_sheet->isLoading())
</span><del>- document.styleSheetCollection().removePendingSheet();
</del><ins>+ document.authorStyleSheets().removePendingSheet();
</ins><span class="cx"> clearSheet();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -137,7 +138,7 @@
</span><span class="cx"> if (!screenEval.eval(mediaQueries.get()) && !printEval.eval(mediaQueries.get()))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- document.styleSheetCollection().addPendingSheet();
</del><ins>+ document.authorStyleSheets().addPendingSheet();
</ins><span class="cx">
</span><span class="cx"> m_loading = true;
</span><span class="cx">
</span><span class="lines">@@ -164,13 +165,13 @@
</span><span class="cx"> if (isLoading())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- document.styleSheetCollection().removePendingSheet();
</del><ins>+ document.authorStyleSheets().removePendingSheet();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InlineStyleSheetOwner::startLoadingDynamicSheet(Document& document)
</span><span class="cx"> {
</span><del>- document.styleSheetCollection().addPendingSheet();
</del><ins>+ document.authorStyleSheets().addPendingSheet();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomProcessingInstructioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ProcessingInstruction.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ProcessingInstruction.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/dom/ProcessingInstruction.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ProcessingInstruction.h"
</span><span class="cx">
</span><ins>+#include "AuthorStyleSheets.h"
</ins><span class="cx"> #include "CSSStyleSheet.h"
</span><span class="cx"> #include "CachedCSSStyleSheet.h"
</span><span class="cx"> #include "CachedResourceLoader.h"
</span><span class="lines">@@ -66,7 +67,7 @@
</span><span class="cx"> m_cachedSheet->removeClient(this);
</span><span class="cx">
</span><span class="cx"> if (inDocument())
</span><del>- document().styleSheetCollection().removeStyleSheetCandidateNode(*this);
</del><ins>+ document().authorStyleSheets().removeStyleSheetCandidateNode(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String ProcessingInstruction::nodeName() const
</span><span class="lines">@@ -142,7 +143,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_loading = true;
</span><del>- document().styleSheetCollection().addPendingSheet();
</del><ins>+ document().authorStyleSheets().addPendingSheet();
</ins><span class="cx">
</span><span class="cx"> CachedResourceRequest request(ResourceRequest(document().completeURL(href)));
</span><span class="cx"> #if ENABLE(XSLT)
</span><span class="lines">@@ -163,7 +164,7 @@
</span><span class="cx"> else {
</span><span class="cx"> // The request may have been denied if (for example) the stylesheet is local and the document is remote.
</span><span class="cx"> m_loading = false;
</span><del>- document().styleSheetCollection().removePendingSheet();
</del><ins>+ document().authorStyleSheets().removePendingSheet();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -181,7 +182,7 @@
</span><span class="cx"> bool ProcessingInstruction::sheetLoaded()
</span><span class="cx"> {
</span><span class="cx"> if (!isLoading()) {
</span><del>- document().styleSheetCollection().removePendingSheet();
</del><ins>+ document().authorStyleSheets().removePendingSheet();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="lines">@@ -265,7 +266,7 @@
</span><span class="cx"> CharacterData::insertedInto(insertionPoint);
</span><span class="cx"> if (!insertionPoint.inDocument())
</span><span class="cx"> return InsertionDone;
</span><del>- document().styleSheetCollection().addStyleSheetCandidateNode(*this, m_createdByParser);
</del><ins>+ document().authorStyleSheets().addStyleSheetCandidateNode(*this, m_createdByParser);
</ins><span class="cx"> checkStyleSheet();
</span><span class="cx"> return InsertionDone;
</span><span class="cx"> }
</span><span class="lines">@@ -276,7 +277,7 @@
</span><span class="cx"> if (!insertionPoint.inDocument())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- document().styleSheetCollection().removeStyleSheetCandidateNode(*this);
</del><ins>+ document().authorStyleSheets().removeStyleSheetCandidateNode(*this);
</ins><span class="cx">
</span><span class="cx"> if (m_sheet) {
</span><span class="cx"> ASSERT(m_sheet->ownerNode() == this);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLinkElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -27,12 +27,12 @@
</span><span class="cx">
</span><span class="cx"> #include "Attribute.h"
</span><span class="cx"> #include "AttributeDOMTokenList.h"
</span><ins>+#include "AuthorStyleSheets.h"
</ins><span class="cx"> #include "CachedCSSStyleSheet.h"
</span><span class="cx"> #include "CachedResource.h"
</span><span class="cx"> #include "CachedResourceLoader.h"
</span><span class="cx"> #include "CachedResourceRequest.h"
</span><span class="cx"> #include "Document.h"
</span><del>-#include "DocumentStyleSheetCollection.h"
</del><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "EventSender.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> m_cachedSheet->removeClient(this);
</span><span class="cx">
</span><span class="cx"> if (inDocument())
</span><del>- document().styleSheetCollection().removeStyleSheetCandidateNode(*this);
</del><ins>+ document().authorStyleSheets().removeStyleSheetCandidateNode(*this);
</ins><span class="cx">
</span><span class="cx"> linkLoadEventSender().cancelEvent(*this);
</span><span class="cx"> }
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> if (m_isInShadowTree)
</span><span class="cx"> return InsertionDone;
</span><span class="cx">
</span><del>- document().styleSheetCollection().addStyleSheetCandidateNode(*this, m_createdByParser);
</del><ins>+ document().authorStyleSheets().addStyleSheetCandidateNode(*this, m_createdByParser);
</ins><span class="cx">
</span><span class="cx"> process();
</span><span class="cx"> return InsertionDone;
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> ASSERT(!m_sheet);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- document().styleSheetCollection().removeStyleSheetCandidateNode(*this);
</del><ins>+ document().authorStyleSheets().removeStyleSheetCandidateNode(*this);
</ins><span class="cx">
</span><span class="cx"> if (m_sheet)
</span><span class="cx"> clearSheet();
</span><span class="lines">@@ -514,7 +514,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_pendingSheetType == InactiveSheet)
</span><span class="cx"> return;
</span><del>- document().styleSheetCollection().addPendingSheet();
</del><ins>+ document().authorStyleSheets().addPendingSheet();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLLinkElement::removePendingSheet(RemovePendingSheetNotificationType notification)
</span><span class="lines">@@ -527,14 +527,14 @@
</span><span class="cx">
</span><span class="cx"> if (type == InactiveSheet) {
</span><span class="cx"> // Document just needs to know about the sheet for exposure through document.styleSheets
</span><del>- document().styleSheetCollection().updateActiveStyleSheets(DocumentStyleSheetCollection::OptimizedUpdate);
</del><ins>+ document().authorStyleSheets().updateActiveStyleSheets(AuthorStyleSheets::OptimizedUpdate);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- document().styleSheetCollection().removePendingSheet(
</del><ins>+ document().authorStyleSheets().removePendingSheet(
</ins><span class="cx"> notification == RemovePendingSheetNotifyImmediately
</span><del>- ? DocumentStyleSheetCollection::RemovePendingSheetNotifyImmediately
- : DocumentStyleSheetCollection::RemovePendingSheetNotifyLater);
</del><ins>+ ? AuthorStyleSheets::RemovePendingSheetNotifyImmediately
+ : AuthorStyleSheets::RemovePendingSheetNotifyLater);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLQuoteElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLQuoteElement.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLQuoteElement.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/html/HTMLQuoteElement.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> #include "HTMLQuoteElement.h"
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><del>-#include "DocumentStyleSheetCollection.h"
</del><span class="cx"> #include "HTMLNames.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorCSSAgent.h"
</span><span class="cx">
</span><ins>+#include "AuthorStyleSheets.h"
</ins><span class="cx"> #include "CSSComputedStyleDeclaration.h"
</span><span class="cx"> #include "CSSImportRule.h"
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><span class="lines">@@ -665,7 +666,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorCSSAgent::collectAllDocumentStyleSheets(Document& document, Vector<CSSStyleSheet*>& result)
</span><span class="cx"> {
</span><del>- Vector<RefPtr<CSSStyleSheet>> cssStyleSheets = document.styleSheetCollection().activeStyleSheetsForInspector();
</del><ins>+ auto cssStyleSheets = document.authorStyleSheets().activeStyleSheetsForInspector();
</ins><span class="cx"> for (auto& cssStyleSheet : cssStyleSheets)
</span><span class="cx"> collectStyleSheets(cssStyleSheet.get(), result);
</span><span class="cx"> }
</span><span class="lines">@@ -1015,7 +1016,7 @@
</span><span class="cx">
</span><span class="cx"> // StyleRules returned by StyleResolver::styleRulesForElement lack parent pointers since that infomation is not cheaply available.
</span><span class="cx"> // Since the inspector wants to walk the parent chain, we construct the full wrappers here.
</span><del>- CSSStyleRule* cssomWrapper = styleResolver.inspectorCSSOMWrappers().getWrapperForRuleInSheets(styleRule, styleResolver.document().styleSheetCollection());
</del><ins>+ CSSStyleRule* cssomWrapper = styleResolver.inspectorCSSOMWrappers().getWrapperForRuleInSheets(styleRule, styleResolver.document().authorStyleSheets(), styleResolver.document().extensionStyleSheets());
</ins><span class="cx"> if (!cssomWrapper)
</span><span class="cx"> return nullptr;
</span><span class="cx"> InspectorStyleSheet* inspectorStyleSheet = bindStyleSheet(cssomWrapper->parentStyleSheet());
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #include "DocumentParser.h"
</span><span class="cx"> #include "DocumentWriter.h"
</span><span class="cx"> #include "Event.h"
</span><ins>+#include "ExtensionStyleSheets.h"
</ins><span class="cx"> #include "FormState.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="lines">@@ -845,13 +846,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><del>- DocumentStyleSheetCollection& styleSheetCollection = m_frame->document()->styleSheetCollection();
</del><ins>+ auto& extensionStyleSheets = m_frame->document()->extensionStyleSheets();
</ins><span class="cx">
</span><span class="cx"> for (auto& pendingStyleSheet : m_pendingNamedContentExtensionStyleSheets)
</span><del>- styleSheetCollection.maybeAddContentExtensionSheet(pendingStyleSheet.key, *pendingStyleSheet.value);
</del><ins>+ extensionStyleSheets.maybeAddContentExtensionSheet(pendingStyleSheet.key, *pendingStyleSheet.value);
</ins><span class="cx"> for (auto& pendingSelectorEntry : m_pendingContentExtensionDisplayNoneSelectors) {
</span><span class="cx"> for (const auto& pendingSelector : pendingSelectorEntry.value)
</span><del>- styleSheetCollection.addDisplayNoneSelector(pendingSelectorEntry.key, pendingSelector.first, pendingSelector.second);
</del><ins>+ extensionStyleSheets.addDisplayNoneSelector(pendingSelectorEntry.key, pendingSelector.first, pendingSelector.second);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_pendingNamedContentExtensionStyleSheets.clear();
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/page/Page.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "ContextMenuController.h"
</span><span class="cx"> #include "DatabaseProvider.h"
</span><span class="cx"> #include "DocumentMarkerController.h"
</span><del>-#include "DocumentStyleSheetCollection.h"
</del><span class="cx"> #include "DragController.h"
</span><span class="cx"> #include "Editor.h"
</span><span class="cx"> #include "EditorClient.h"
</span><span class="lines">@@ -40,6 +39,7 @@
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "ExceptionCodePlaceholder.h"
</span><ins>+#include "ExtensionStyleSheets.h"
</ins><span class="cx"> #include "FileSystem.h"
</span><span class="cx"> #include "FocusController.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="lines">@@ -1013,7 +1013,7 @@
</span><span class="cx">
</span><span class="cx"> for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> if (frame->document())
</span><del>- frame->document()->styleSheetCollection().updatePageUserSheet();
</del><ins>+ frame->document()->extensionStyleSheets().updatePageUserSheet();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1631,7 +1631,7 @@
</span><span class="cx">
</span><span class="cx"> for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> if (Document *document = frame->document()) {
</span><del>- document->styleSheetCollection().invalidateInjectedStyleSheetCache();
</del><ins>+ document->extensionStyleSheets().invalidateInjectedStyleSheetCache();
</ins><span class="cx"> document->styleResolverChanged(DeferRecalcStyle);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageGroup.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageGroup.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/page/PageGroup.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "ChromeClient.h"
</span><span class="cx"> #include "DOMWrapperWorld.h"
</span><span class="cx"> #include "Document.h"
</span><del>-#include "DocumentStyleSheetCollection.h"
</del><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PageCache.h"
</span></span></pre></div>
<a id="trunkSourceWebCorepageUserContentControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/UserContentController.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/UserContentController.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/page/UserContentController.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "DOMWrapperWorld.h"
</span><span class="cx"> #include "Document.h"
</span><ins>+#include "ExtensionStyleSheets.h"
</ins><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "ResourceLoadInfo.h"
</span><span class="lines">@@ -243,7 +244,7 @@
</span><span class="cx"> {
</span><span class="cx"> for (auto& page : m_pages) {
</span><span class="cx"> for (Frame* frame = &page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><del>- frame->document()->styleSheetCollection().invalidateInjectedStyleSheetCache();
</del><ins>+ frame->document()->extensionStyleSheets().invalidateInjectedStyleSheetCache();
</ins><span class="cx"> frame->document()->styleResolverChanged(DeferRecalcStyle);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -2824,7 +2824,7 @@
</span><span class="cx"> if (isReplaced() && linePositionMode == PositionOnContainingLine)
</span><span class="cx"> return RenderBox::lineHeight(firstLine, direction, linePositionMode);
</span><span class="cx">
</span><del>- if (firstLine && document().styleSheetCollection().usesFirstLineRules()) {
</del><ins>+ if (firstLine && view().usesFirstLineRules()) {
</ins><span class="cx"> RenderStyle& s = firstLine ? firstLineStyle() : style();
</span><span class="cx"> if (&s != &style())
</span><span class="cx"> return s.computedLineHeight();
</span><span class="lines">@@ -3161,7 +3161,7 @@
</span><span class="cx"> firstLetter = nullptr;
</span><span class="cx"> firstLetterContainer = nullptr;
</span><span class="cx">
</span><del>- if (!document().styleSheetCollection().usesFirstLetterRules())
</del><ins>+ if (!view().usesFirstLetterRules())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Don't recur
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<RenderStyle> RenderElement::uncachedFirstLineStyle(RenderStyle* style) const
</span><span class="cx"> {
</span><del>- if (!document().styleSheetCollection().usesFirstLineRules())
</del><ins>+ if (!view().usesFirstLineRules())
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> return firstLineStyleForCachedUncachedType(Uncached, *this, style);
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx">
</span><span class="cx"> RenderStyle* RenderElement::cachedFirstLineStyle() const
</span><span class="cx"> {
</span><del>- ASSERT(document().styleSheetCollection().usesFirstLineRules());
</del><ins>+ ASSERT(view().usesFirstLineRules());
</ins><span class="cx">
</span><span class="cx"> RenderStyle& style = this->style();
</span><span class="cx"> if (RefPtr<RenderStyle> firstLineStyle = firstLineStyleForCachedUncachedType(Cached, *this, &style))
</span><span class="lines">@@ -249,6 +249,11 @@
</span><span class="cx"> return &style;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RenderStyle& RenderElement::firstLineStyle() const
+{
+ return view().usesFirstLineRules() ? *cachedFirstLineStyle() : style();
+}
+
</ins><span class="cx"> StyleDifference RenderElement::adjustStyleDifference(StyleDifference diff, unsigned contextSensitiveProperties) const
</span><span class="cx"> {
</span><span class="cx"> // If transform changed, and we are not composited, need to do a layout.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -346,11 +346,6 @@
</span><span class="cx"> setStyle(WTF::move(animatedStyle), minimalStyleDifference);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline RenderStyle& RenderElement::firstLineStyle() const
-{
- return document().styleSheetCollection().usesFirstLineRules() ? *cachedFirstLineStyle() : style();
-}
-
</del><span class="cx"> inline void RenderElement::setAncestorLineBoxDirty(bool f)
</span><span class="cx"> {
</span><span class="cx"> m_ancestorLineBoxDirty = f;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> || parentStyle->lineHeight() != style().lineHeight()))
</span><span class="cx"> || (flowThread && flowThread->isRenderNamedFlowThread()); // FIXME: Enable the optimization once we make overflow computation for culled inlines in regions.
</span><span class="cx">
</span><del>- if (!alwaysCreateLineBoxes && checkFonts && document().styleSheetCollection().usesFirstLineRules()) {
</del><ins>+ if (!alwaysCreateLineBoxes && checkFonts && view().usesFirstLineRules()) {
</ins><span class="cx"> // Have to check the first line style as well.
</span><span class="cx"> parentStyle = &parent()->firstLineStyle();
</span><span class="cx"> RenderStyle& childStyle = firstLineStyle();
</span><span class="lines">@@ -1457,7 +1457,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderInline::lineHeight(bool firstLine, LineDirectionMode /*direction*/, LinePositionMode /*linePositionMode*/) const
</span><span class="cx"> {
</span><del>- if (firstLine && document().styleSheetCollection().usesFirstLineRules()) {
</del><ins>+ if (firstLine && view().usesFirstLineRules()) {
</ins><span class="cx"> const RenderStyle& firstLineStyle = this->firstLineStyle();
</span><span class="cx"> if (&firstLineStyle != &style())
</span><span class="cx"> return firstLineStyle.computedLineHeight();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLineBreakcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLineBreak.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLineBreak.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/rendering/RenderLineBreak.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderLineBreak::lineHeight(bool firstLine, LineDirectionMode /*direction*/, LinePositionMode /*linePositionMode*/) const
</span><span class="cx"> {
</span><del>- if (firstLine && document().styleSheetCollection().usesFirstLineRules()) {
</del><ins>+ if (firstLine && view().usesFirstLineRules()) {
</ins><span class="cx"> const RenderStyle& firstLineStyle = this->firstLineStyle();
</span><span class="cx"> if (&firstLineStyle != &style())
</span><span class="cx"> return firstLineStyle.computedLineHeight();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/rendering/RenderView.h 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -187,6 +187,11 @@
</span><span class="cx"> WEBCORE_EXPORT RenderLayerCompositor& compositor();
</span><span class="cx"> WEBCORE_EXPORT bool usesCompositing() const;
</span><span class="cx">
</span><ins>+ bool usesFirstLineRules() const { return m_usesFirstLineRules; }
+ bool usesFirstLetterRules() const { return m_usesFirstLetterRules; }
+ void setUsesFirstLineRules(bool value) { m_usesFirstLineRules = value; }
+ void setUsesFirstLetterRules(bool value) { m_usesFirstLetterRules = value; }
+
</ins><span class="cx"> WEBCORE_EXPORT IntRect unscaledDocumentRect() const;
</span><span class="cx"> LayoutRect unextendedBackgroundRect() const;
</span><span class="cx"> LayoutRect backgroundRect() const;
</span><span class="lines">@@ -369,6 +374,8 @@
</span><span class="cx">
</span><span class="cx"> bool m_selectionWasCaret;
</span><span class="cx"> bool m_hasSoftwareFilters;
</span><ins>+ bool m_usesFirstLineRules { false };
+ bool m_usesFirstLetterRules { false };
</ins><span class="cx">
</span><span class="cx"> HashSet<RenderElement*> m_renderersWithPausedImageAnimation;
</span><span class="cx"> Vector<RefPtr<RenderWidget>> m_protectedRenderWidgets;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRootInlineBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RootInlineBox.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RootInlineBox.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/rendering/RootInlineBox.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -999,7 +999,7 @@
</span><span class="cx">
</span><span class="cx"> // This method determines the vertical position for inline elements.
</span><span class="cx"> bool firstLine = isFirstLine();
</span><del>- if (firstLine && !renderer->document().styleSheetCollection().usesFirstLineRules())
</del><ins>+ if (firstLine && !blockFlow().view().usesFirstLineRules())
</ins><span class="cx"> firstLine = false;
</span><span class="cx">
</span><span class="cx"> // Check the cache.
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "AXObjectCache.h"
</span><span class="cx"> #include "AnimationController.h"
</span><ins>+#include "AuthorStyleSheets.h"
</ins><span class="cx"> #include "CSSFontSelector.h"
</span><span class="cx"> #include "ElementIterator.h"
</span><span class="cx"> #include "ElementRareData.h"
</span><span class="lines">@@ -685,7 +686,7 @@
</span><span class="cx">
</span><span class="cx"> // If "rem" units are used anywhere in the document, and if the document element's font size changes, then force font updating
</span><span class="cx"> // all the way down the tree. This is simpler than having to maintain a cache of objects (and such font size changes should be rare anyway).
</span><del>- if (document.styleSheetCollection().usesRemUnits() && document.documentElement() == &current && localChange != NoChange && currentStyle && newStyle && currentStyle->fontSize() != newStyle->fontSize()) {
</del><ins>+ if (document.authorStyleSheets().usesRemUnits() && document.documentElement() == &current && localChange != NoChange && currentStyle && newStyle && currentStyle->fontSize() != newStyle->fontSize()) {
</ins><span class="cx"> // Cached RenderStyles may depend on the re units.
</span><span class="cx"> if (StyleResolver* styleResolver = document.styleResolverIfExists())
</span><span class="cx"> styleResolver->invalidateMatchedPropertiesCache();
</span><span class="lines">@@ -914,6 +915,8 @@
</span><span class="cx">
</span><span class="cx"> void resolveTree(Document& document, Change change)
</span><span class="cx"> {
</span><ins>+ auto& renderView = *document.renderView();
+
</ins><span class="cx"> if (change == Force) {
</span><span class="cx"> auto documentStyle = resolveForDocument(document);
</span><span class="cx">
</span><span class="lines">@@ -924,9 +927,9 @@
</span><span class="cx"> documentStyle.get().fontCascade().update(&document.fontSelector());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Style::Change documentChange = determineChange(documentStyle.get(), document.renderView()->style());
</del><ins>+ Style::Change documentChange = determineChange(documentStyle.get(), renderView.style());
</ins><span class="cx"> if (documentChange != NoChange)
</span><del>- document.renderView()->setStyle(WTF::move(documentStyle));
</del><ins>+ renderView.setStyle(WTF::move(documentStyle));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Element* documentElement = document.documentElement();
</span><span class="lines">@@ -934,8 +937,18 @@
</span><span class="cx"> return;
</span><span class="cx"> if (change < Inherit && !documentElement->childNeedsStyleRecalc() && !documentElement->needsStyleRecalc())
</span><span class="cx"> return;
</span><del>- RenderTreePosition renderTreePosition(*document.renderView());
</del><ins>+
+ auto& styleResolved = document.ensureStyleResolver();
+
+ // Pseudo element removal and similar may only work with these flags still set. Reset them after the style recalc.
+ renderView.setUsesFirstLineRules(renderView.usesFirstLineRules() || styleResolved.usesFirstLineRules());
+ renderView.setUsesFirstLetterRules(renderView.usesFirstLetterRules() || styleResolved.usesFirstLetterRules());
+
+ RenderTreePosition renderTreePosition(renderView);
</ins><span class="cx"> resolveTree(*documentElement, *document.renderStyle(), renderTreePosition, change);
</span><ins>+
+ renderView.setUsesFirstLineRules(styleResolved.usesFirstLineRules());
+ renderView.setUsesFirstLetterRules(styleResolved.usesFirstLetterRules());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void detachRenderTree(Element& element)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (190168 => 190169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-09-23 14:32:36 UTC (rev 190168)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-09-23 15:04:16 UTC (rev 190169)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "EventHandler.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><ins>+#include "ExtensionStyleSheets.h"
</ins><span class="cx"> #include "File.h"
</span><span class="cx"> #include "FontCache.h"
</span><span class="cx"> #include "FormController.h"
</span><span class="lines">@@ -1940,7 +1941,7 @@
</span><span class="cx"> auto parsedSheet = StyleSheetContents::create(*document);
</span><span class="cx"> parsedSheet.get().setIsUserStyleSheet(false);
</span><span class="cx"> parsedSheet.get().parseString(css);
</span><del>- document->styleSheetCollection().addAuthorSheet(WTF::move(parsedSheet));
</del><ins>+ document->extensionStyleSheets().addAuthorStyleSheetForTesting(WTF::move(parsedSheet));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Internals::insertUserCSS(const String& css, ExceptionCode& ec) const
</span><span class="lines">@@ -1954,7 +1955,7 @@
</span><span class="cx"> auto parsedSheet = StyleSheetContents::create(*document);
</span><span class="cx"> parsedSheet.get().setIsUserStyleSheet(true);
</span><span class="cx"> parsedSheet.get().parseString(css);
</span><del>- document->styleSheetCollection().addUserSheet(WTF::move(parsedSheet));
</del><ins>+ document->extensionStyleSheets().addUserStyleSheet(WTF::move(parsedSheet));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String Internals::counterValue(Element* element)
</span></span></pre>
</div>
</div>
</body>
</html>