<!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>[165076] 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/165076">165076</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-03-04 14:23:13 -0800 (Tue, 04 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a Document::updateStyleIfNeededForNode(Node&).
<https://webkit.org/b/129689>
Generalize the mechanism that computed style uses to avoid doing full
style updates when the node we're interested in isn't actually dirty.
Reviewed by Antti Koivisto.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* dom/Document.cpp:
(WebCore::nodeOrItsAncestorNeedsStyleRecalc):
(WebCore::Document::updateStyleIfNeededForNode):
* dom/Document.h:
* editing/htmlediting.cpp:
(WebCore::isEditablePosition):
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::defaultEventHandler):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.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="#trunkSourceWebCoreeditinghtmleditingcpp">trunk/Source/WebCore/editing/htmlediting.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementcpp">trunk/Source/WebCore/html/HTMLInputElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165075 => 165076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-04 22:15:16 UTC (rev 165075)
+++ trunk/Source/WebCore/ChangeLog 2014-03-04 22:23:13 UTC (rev 165076)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-03-04 Andreas Kling <akling@apple.com>
+
+ Add a Document::updateStyleIfNeededForNode(Node&).
+ <https://webkit.org/b/129689>
+
+ Generalize the mechanism that computed style uses to avoid doing full
+ style updates when the node we're interested in isn't actually dirty.
+
+ Reviewed by Antti Koivisto.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * dom/Document.cpp:
+ (WebCore::nodeOrItsAncestorNeedsStyleRecalc):
+ (WebCore::Document::updateStyleIfNeededForNode):
+ * dom/Document.h:
+ * editing/htmlediting.cpp:
+ (WebCore::isEditablePosition):
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::defaultEventHandler):
+
</ins><span class="cx"> 2014-03-04 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge API shims and JSLock
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (165075 => 165076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-03-04 22:15:16 UTC (rev 165075)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-03-04 22:23:13 UTC (rev 165076)
</span><span class="lines">@@ -1609,17 +1609,6 @@
</span><span class="cx"> return ComputedStyleExtractor(m_node, m_allowVisitedStyle, m_pseudoElementSpecifier).copyProperties();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool nodeOrItsAncestorNeedsStyleRecalc(Node* styledNode)
-{
- if (styledNode->document().hasPendingForcedStyleRecalc())
- return true;
- for (Node* n = styledNode; n; n = n->parentNode()) {// FIXME: Call parentOrShadowHostNode() instead
- if (n->needsStyleRecalc())
- return true;
- }
- return false;
-}
-
</del><span class="cx"> static inline PassRefPtr<RenderStyle> computeRenderStyleForProperty(Node* styledNode, PseudoId pseudoElementSpecifier, CSSPropertyID propertyID)
</span><span class="cx"> {
</span><span class="cx"> RenderObject* renderer = styledNode->renderer();
</span><span class="lines">@@ -1674,8 +1663,7 @@
</span><span class="cx"> if (updateLayout) {
</span><span class="cx"> Document& document = styledNode->document();
</span><span class="cx">
</span><del>- if (nodeOrItsAncestorNeedsStyleRecalc(styledNode)) {
- document.updateStyleIfNeeded();
</del><ins>+ if (document.updateStyleIfNeededForNode(*styledNode)) {
</ins><span class="cx"> // The style recalc could have caused the styled node to be discarded or replaced
</span><span class="cx"> // if it was a PseudoElement so we need to update it.
</span><span class="cx"> styledNode = this->styledNode();
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (165075 => 165076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-03-04 22:15:16 UTC (rev 165075)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-03-04 22:23:13 UTC (rev 165076)
</span><span class="lines">@@ -6049,4 +6049,21 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(SUBTLE_CRYPTO)
</span><span class="cx">
</span><ins>+static inline bool nodeOrItsAncestorNeedsStyleRecalc(const Node& node)
+{
+ for (const Node* n = &node; n; n = n->parentOrShadowHostElement()) {
+ if (n->needsStyleRecalc())
+ return true;
+ }
+ return false;
+}
+
+bool Document::updateStyleIfNeededForNode(const Node& node)
+{
+ if (!hasPendingForcedStyleRecalc() && !nodeOrItsAncestorNeedsStyleRecalc(node))
+ return false;
+ updateStyleIfNeeded();
+ return true;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (165075 => 165076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-03-04 22:15:16 UTC (rev 165075)
+++ trunk/Source/WebCore/dom/Document.h 2014-03-04 22:23:13 UTC (rev 165076)
</span><span class="lines">@@ -589,6 +589,7 @@
</span><span class="cx">
</span><span class="cx"> void recalcStyle(Style::Change = Style::NoChange);
</span><span class="cx"> void updateStyleIfNeeded();
</span><ins>+ bool updateStyleIfNeededForNode(const Node&);
</ins><span class="cx"> void updateLayout();
</span><span class="cx"> void updateLayoutIgnorePendingStylesheets();
</span><span class="cx"> PassRef<RenderStyle> styleForElementIgnoringPendingStylesheets(Element*);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditinghtmleditingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/htmlediting.cpp (165075 => 165076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/htmlediting.cpp 2014-03-04 22:15:16 UTC (rev 165075)
+++ trunk/Source/WebCore/editing/htmlediting.cpp 2014-03-04 22:23:13 UTC (rev 165076)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> if (!node)
</span><span class="cx"> return false;
</span><span class="cx"> if (updateStyle == UpdateStyle)
</span><del>- node->document().updateStyleIfNeeded();
</del><ins>+ node->document().updateStyleIfNeededForNode(*node);
</ins><span class="cx"> else
</span><span class="cx"> ASSERT(updateStyle == DoNotUpdateStyle);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (165075 => 165076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2014-03-04 22:15:16 UTC (rev 165075)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2014-03-04 22:23:13 UTC (rev 165076)
</span><span class="lines">@@ -1176,7 +1176,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- document().updateStyleIfNeeded();
</del><ins>+ document().updateStyleIfNeededForNode(*this);
</ins><span class="cx"> m_inputType->forwardEvent(evt);
</span><span class="cx">
</span><span class="cx"> if (!callBaseClassEarly && !evt->defaultHandled())
</span></span></pre>
</div>
</div>
</body>
</html>