<!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>[176388] 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/176388">176388</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-11-20 00:43:25 -0800 (Thu, 20 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove "document has no sibling rules" optimization.
<https://webkit.org/b/138902>
Reviewed by Antti Koivisto.
We were keeping a document-level flag to track whether there are any
sibling rules in any active style sheets.
This information was used to do.. nothing.
* css/StyleResolver.h:
(WebCore::StyleResolver::usesSiblingRules): Deleted.
* dom/DocumentStyleSheetCollection.cpp:
(WebCore::DocumentStyleSheetCollection::DocumentStyleSheetCollection):
(WebCore::DocumentStyleSheetCollection::combineCSSFeatureFlags):
(WebCore::DocumentStyleSheetCollection::resetCSSFeatureFlags):
* dom/DocumentStyleSheetCollection.h:
(WebCore::DocumentStyleSheetCollection::usesSiblingRules): Deleted.
(WebCore::DocumentStyleSheetCollection::setUsesSiblingRulesOverride): Deleted.
* mathml/MathMLMathElement.cpp:
(WebCore::MathMLMathElement::insertedInto): Deleted.
* mathml/MathMLMathElement.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentStyleSheetCollectioncpp">trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentStyleSheetCollectionh">trunk/Source/WebCore/dom/DocumentStyleSheetCollection.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLMathElementcpp">trunk/Source/WebCore/mathml/MathMLMathElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLMathElementh">trunk/Source/WebCore/mathml/MathMLMathElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176387 => 176388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-20 08:36:11 UTC (rev 176387)
+++ trunk/Source/WebCore/ChangeLog 2014-11-20 08:43:25 UTC (rev 176388)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2014-11-20 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><ins>+ Remove "document has no sibling rules" optimization.
+ <https://webkit.org/b/138902>
+
+ Reviewed by Antti Koivisto.
+
+ We were keeping a document-level flag to track whether there are any
+ sibling rules in any active style sheets.
+
+ This information was used to do.. nothing.
+
+ * css/StyleResolver.h:
+ (WebCore::StyleResolver::usesSiblingRules): Deleted.
+ * dom/DocumentStyleSheetCollection.cpp:
+ (WebCore::DocumentStyleSheetCollection::DocumentStyleSheetCollection):
+ (WebCore::DocumentStyleSheetCollection::combineCSSFeatureFlags):
+ (WebCore::DocumentStyleSheetCollection::resetCSSFeatureFlags):
+ * dom/DocumentStyleSheetCollection.h:
+ (WebCore::DocumentStyleSheetCollection::usesSiblingRules): Deleted.
+ (WebCore::DocumentStyleSheetCollection::setUsesSiblingRulesOverride): Deleted.
+ * mathml/MathMLMathElement.cpp:
+ (WebCore::MathMLMathElement::insertedInto): Deleted.
+ * mathml/MathMLMathElement.h:
+
+2014-11-20 Andreas Kling <akling@apple.com>
+
</ins><span class="cx"> Caret renderer is always a RenderBlock.
</span><span class="cx"> <https://webkit.org/b/138912>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (176387 => 176388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2014-11-20 08:36:11 UTC (rev 176387)
+++ trunk/Source/WebCore/css/StyleResolver.h 2014-11-20 08:43:25 UTC (rev 176388)
</span><span class="lines">@@ -229,7 +229,6 @@
</span><span class="cx">
</span><span class="cx"> bool checkRegionStyle(Element* regionElement);
</span><span class="cx">
</span><del>- bool usesSiblingRules() const { return !m_ruleSets.features().siblingRules.isEmpty(); }
</del><span class="cx"> bool usesFirstLineRules() const { return m_ruleSets.features().usesFirstLineRules; }
</span><span class="cx"> bool usesFirstLetterRules() const { return m_ruleSets.features().usesFirstLetterRules; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentStyleSheetCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp (176387 => 176388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2014-11-20 08:36:11 UTC (rev 176387)
+++ trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2014-11-20 08:43:25 UTC (rev 176388)
</span><span class="lines">@@ -56,8 +56,6 @@
</span><span class="cx"> , m_injectedStyleSheetCacheValid(false)
</span><span class="cx"> , m_hadActiveLoadingStylesheet(false)
</span><span class="cx"> , m_pendingUpdateType(NoUpdate)
</span><del>- , m_usesSiblingRules(false)
- , m_usesSiblingRulesOverride(false)
</del><span class="cx"> , m_usesFirstLineRules(false)
</span><span class="cx"> , m_usesFirstLetterRules(false)
</span><span class="cx"> , m_usesRemUnits(false)
</span><span class="lines">@@ -68,7 +66,6 @@
</span><span class="cx"> {
</span><span class="cx"> // 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).
</span><span class="cx"> const StyleResolver& styleResolver = m_document.ensureStyleResolver();
</span><del>- m_usesSiblingRules = m_usesSiblingRules || styleResolver.usesSiblingRules();
</del><span class="cx"> m_usesFirstLineRules = m_usesFirstLineRules || styleResolver.usesFirstLineRules();
</span><span class="cx"> m_usesFirstLetterRules = m_usesFirstLetterRules || styleResolver.usesFirstLetterRules();
</span><span class="cx"> }
</span><span class="lines">@@ -76,7 +73,6 @@
</span><span class="cx"> void DocumentStyleSheetCollection::resetCSSFeatureFlags()
</span><span class="cx"> {
</span><span class="cx"> const StyleResolver& styleResolver = m_document.ensureStyleResolver();
</span><del>- m_usesSiblingRules = styleResolver.usesSiblingRules();
</del><span class="cx"> m_usesFirstLineRules = styleResolver.usesFirstLineRules();
</span><span class="cx"> m_usesFirstLetterRules = styleResolver.usesFirstLetterRules();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentStyleSheetCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentStyleSheetCollection.h (176387 => 176388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentStyleSheetCollection.h 2014-11-20 08:36:11 UTC (rev 176387)
+++ trunk/Source/WebCore/dom/DocumentStyleSheetCollection.h 2014-11-20 08:43:25 UTC (rev 176388)
</span><span class="lines">@@ -101,8 +101,6 @@
</span><span class="cx">
</span><span class="cx"> bool hasPendingSheets() const { return m_pendingStylesheets > 0; }
</span><span class="cx">
</span><del>- bool usesSiblingRules() const { return m_usesSiblingRules || m_usesSiblingRulesOverride; }
- void setUsesSiblingRulesOverride(bool b) { m_usesSiblingRulesOverride = b; }
</del><span class="cx"> bool usesFirstLineRules() const { return m_usesFirstLineRules; }
</span><span class="cx"> bool usesFirstLetterRules() const { return m_usesFirstLetterRules; }
</span><span class="cx"> bool usesRemUnits() const { return m_usesRemUnits; }
</span><span class="lines">@@ -156,8 +154,6 @@
</span><span class="cx"> String m_preferredStylesheetSetName;
</span><span class="cx"> String m_selectedStylesheetSetName;
</span><span class="cx">
</span><del>- bool m_usesSiblingRules;
- bool m_usesSiblingRulesOverride;
</del><span class="cx"> bool m_usesFirstLineRules;
</span><span class="cx"> bool m_usesFirstLetterRules;
</span><span class="cx"> bool m_usesRemUnits;
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLMathElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLMathElement.cpp (176387 => 176388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLMathElement.cpp 2014-11-20 08:36:11 UTC (rev 176387)
+++ trunk/Source/WebCore/mathml/MathMLMathElement.cpp 2014-11-20 08:43:25 UTC (rev 176388)
</span><span class="lines">@@ -43,14 +43,6 @@
</span><span class="cx"> return adoptRef(new MathMLMathElement(tagName, document));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Node::InsertionNotificationRequest MathMLMathElement::insertedInto(ContainerNode& insertionPoint)
-{
- // There are sibling rules in the MathML default style.
- if (insertionPoint.inDocument())
- document().styleSheetCollection().setUsesSiblingRulesOverride(true);
- return MathMLInlineContainerElement::insertedInto(insertionPoint);
-}
-
</del><span class="cx"> RenderPtr<RenderElement> MathMLMathElement::createElementRenderer(PassRef<RenderStyle> style)
</span><span class="cx"> {
</span><span class="cx"> return createRenderer<RenderMathMLMath>(*this, WTF::move(style));
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLMathElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLMathElement.h (176387 => 176388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLMathElement.h 2014-11-20 08:36:11 UTC (rev 176387)
+++ trunk/Source/WebCore/mathml/MathMLMathElement.h 2014-11-20 08:43:25 UTC (rev 176388)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> private:
</span><span class="cx"> MathMLMathElement(const QualifiedName& tagName, Document&);
</span><span class="cx">
</span><del>- virtual InsertionNotificationRequest insertedInto(ContainerNode&) override;
</del><span class="cx"> virtual RenderPtr<RenderElement> createElementRenderer(PassRef<RenderStyle>) override;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>