<!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>[172494] trunk</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/172494">172494</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-08-12 14:31:23 -0700 (Tue, 12 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't recurse into non-rendered subtrees when computing style
https://bugs.webkit.org/show_bug.cgi?id=135844
Reviewed by Andreas Kling.
Source/WebCore:
* style/StyleResolveTree.cpp:
(WebCore::Style::resetStyleForNonRenderedDescendants):
Do a simple reset of the style dirty bits and any computed style in non-rendered subtrees.
(WebCore::Style::attachRenderTree):
(WebCore::Style::resolveTree):
Don't recurse into descendants if the element does not create a renderer.
We didn't compute style anyway in such subtrees.
LayoutTests:
Rebase.
* http/tests/security/video-poster-cross-origin-crash-expected.txt:
* platform/mac/fast/ruby/ruby-base-merge-block-children-crash-2-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityvideopostercrossorigincrashexpectedtxt">trunk/LayoutTests/http/tests/security/video-poster-cross-origin-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrubyrubybasemergeblockchildrencrash2expectedtxt">trunk/LayoutTests/platform/mac/fast/ruby/ruby-base-merge-block-children-crash-2-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172493 => 172494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-08-12 20:58:07 UTC (rev 172493)
+++ trunk/LayoutTests/ChangeLog 2014-08-12 21:31:23 UTC (rev 172494)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-08-12 Antti Koivisto <antti@apple.com>
+
+ Don't recurse into non-rendered subtrees when computing style
+ https://bugs.webkit.org/show_bug.cgi?id=135844
+
+ Reviewed by Andreas Kling.
+
+ Rebase.
+
+ * http/tests/security/video-poster-cross-origin-crash-expected.txt:
+ * platform/mac/fast/ruby/ruby-base-merge-block-children-crash-2-expected.txt:
+
</ins><span class="cx"> 2014-08-12 Fabien Vallée <fvallee@connected-labs.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] playback rate is rounded to integer
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityvideopostercrossorigincrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/video-poster-cross-origin-crash-expected.txt (172493 => 172494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/video-poster-cross-origin-crash-expected.txt 2014-08-12 20:58:07 UTC (rev 172493)
+++ trunk/LayoutTests/http/tests/security/video-poster-cross-origin-crash-expected.txt 2014-08-12 21:31:23 UTC (rev 172494)
</span><span class="lines">@@ -1,3 +1,2 @@
</span><span class="cx"> CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
</span><del>-CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
</del><span class="cx"> >>>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrubyrubybasemergeblockchildrencrash2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/ruby/ruby-base-merge-block-children-crash-2-expected.txt (172493 => 172494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/ruby/ruby-base-merge-block-children-crash-2-expected.txt 2014-08-12 20:58:07 UTC (rev 172493)
+++ trunk/LayoutTests/platform/mac/fast/ruby/ruby-base-merge-block-children-crash-2-expected.txt 2014-08-12 21:31:23 UTC (rev 172494)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x600
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x584
</span><span class="cx"> RenderBlock {SUMMARY} at (0,0) size 784x184
</span><del>- RenderInline {I} at (0,0) size 304x18
</del><ins>+ RenderInline {I} at (0,0) size 604x18
</ins><span class="cx"> RenderRuby (inline) {RUBY} at (0,0) size 300x18
</span><span class="cx"> RenderRubyRun (anonymous) at (0,171) size 0x0
</span><span class="cx"> RenderRubyText {RT} at (0,0) size 0x0
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,150) size 300x-8
</span><span class="cx"> RenderText {#text} at (300,157) size 4x18
</span><span class="cx"> text run at (300,157) width 4: " "
</span><del>- RenderEmbeddedObject {OBJECT} at (304,21) size 300x150
</del><ins>+ RenderEmbeddedObject {OBJECT} at (304,21) size 300x150
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock {DIV} at (0,184) size 784x18
</span><span class="cx"> RenderInline {A} at (0,0) size 138x18 [color=#0000EE]
</span><span class="lines">@@ -29,4 +29,4 @@
</span><span class="cx"> RenderText {#text} at (138,0) size 455x18
</span><span class="cx"> text run at (138,0) width 455: ". This test must be run under Guard Malloc. It passes if it does not crash."
</span><span class="cx"> selection start: position 0 of child 1 {OBJECT} of child 3 {H1} of child 0 {RUBY} of child 1 {I} of child 0 {SUMMARY} of body
</span><del>-selection end: position 0 of child 3 {#text} of child 0 {SUMMARY} of body
</del><ins>+selection end: position 1 of child 2 {OBJECT} of child 1 {I} of child 0 {SUMMARY} of body
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172493 => 172494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-12 20:58:07 UTC (rev 172493)
+++ trunk/Source/WebCore/ChangeLog 2014-08-12 21:31:23 UTC (rev 172494)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-08-12 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><ins>+ Don't recurse into non-rendered subtrees when computing style
+ https://bugs.webkit.org/show_bug.cgi?id=135844
+
+ Reviewed by Andreas Kling.
+
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::resetStyleForNonRenderedDescendants):
+
+ Do a simple reset of the style dirty bits and any computed style in non-rendered subtrees.
+
+ (WebCore::Style::attachRenderTree):
+ (WebCore::Style::resolveTree):
+
+ Don't recurse into descendants if the element does not create a renderer.
+ We didn't compute style anyway in such subtrees.
+
+2014-08-12 Antti Koivisto <antti@apple.com>
+
</ins><span class="cx"> Remove isInCanvasSubtree bit
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135837
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (172493 => 172494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-08-12 20:58:07 UTC (rev 172493)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-08-12 21:31:23 UTC (rev 172494)
</span><span class="lines">@@ -555,6 +555,27 @@
</span><span class="cx"> current.clearAfterPseudoElement();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void resetStyleForNonRenderedDescendants(Element& current)
+{
+ ASSERT(!current.renderStyle());
+ auto descendants = descendantsOfType<Element>(current);
+ auto it = descendants.begin();
+ auto end = descendants.end();
+ while (it != end) {
+ auto& element = *it;
+ ASSERT(!element.renderStyle());
+ if (element.needsStyleRecalc()) {
+ element.resetComputedStyle();
+ element.clearNeedsStyleRecalc();
+ }
+ if (element.childNeedsStyleRecalc()) {
+ element.clearChildNeedsStyleRecalc();
+ it.traverseNext();
+ } else
+ it.traverseNextSkippingChildren();
+ }
+}
+
</ins><span class="cx"> static bool needsPseudoElement(Element& current, PseudoId pseudoId)
</span><span class="cx"> {
</span><span class="cx"> if (!current.document().styleSheetCollection().usesBeforeAfterRules())
</span><span class="lines">@@ -582,36 +603,41 @@
</span><span class="cx"> PostResolutionCallbackDisabler callbackDisabler(current.document());
</span><span class="cx"> WidgetHierarchyUpdatesSuspensionScope suspendWidgetHierarchyUpdates;
</span><span class="cx">
</span><ins>+ if (isInsertionPoint(current)) {
+ attachDistributedChildren(toInsertionPoint(current), inheritedStyle, renderTreePosition);
+ return;
+ }
+
</ins><span class="cx"> if (current.hasCustomStyleResolveCallbacks())
</span><span class="cx"> current.willAttachRenderers();
</span><span class="cx">
</span><span class="cx"> createRendererIfNeeded(current, inheritedStyle, renderTreePosition, resolvedStyle);
</span><span class="cx">
</span><del>- StyleResolverParentPusher parentPusher(&current);
</del><ins>+ if (RenderStyle* style = current.renderStyle()) {
+ StyleResolverParentPusher parentPusher(&current);
</ins><span class="cx">
</span><del>- RenderTreePosition childRenderTreePosition(current.renderer());
- attachBeforeOrAfterPseudoElementIfNeeded(current, BEFORE, childRenderTreePosition);
</del><ins>+ RenderTreePosition childRenderTreePosition(current.renderer());
+ attachBeforeOrAfterPseudoElementIfNeeded(current, BEFORE, childRenderTreePosition);
</ins><span class="cx">
</span><del>- if (ShadowRoot* shadowRoot = current.shadowRoot()) {
- parentPusher.push();
- attachShadowRoot(*shadowRoot);
- } else if (current.firstChild())
- parentPusher.push();
</del><ins>+ if (ShadowRoot* shadowRoot = current.shadowRoot()) {
+ parentPusher.push();
+ attachShadowRoot(*shadowRoot);
+ } else if (current.firstChild())
+ parentPusher.push();
</ins><span class="cx">
</span><del>- if (isInsertionPoint(current))
- attachDistributedChildren(toInsertionPoint(current), inheritedStyle, renderTreePosition);
- else
- attachChildren(current, current.renderStyle(), childRenderTreePosition);
</del><ins>+ attachChildren(current, style, childRenderTreePosition);
</ins><span class="cx">
</span><del>- current.clearNeedsStyleRecalc();
- current.clearChildNeedsStyleRecalc();
</del><ins>+ if (AXObjectCache* cache = current.document().axObjectCache())
+ cache->updateCacheAfterNodeIsAttached(&current);
</ins><span class="cx">
</span><del>- if (AXObjectCache* cache = current.document().axObjectCache())
- cache->updateCacheAfterNodeIsAttached(&current);
</del><ins>+ attachBeforeOrAfterPseudoElementIfNeeded(current, AFTER, childRenderTreePosition);
</ins><span class="cx">
</span><del>- attachBeforeOrAfterPseudoElementIfNeeded(current, AFTER, childRenderTreePosition);
</del><ins>+ current.updateFocusAppearanceAfterAttachIfNeeded();
+ } else
+ resetStyleForNonRenderedDescendants(current);
</ins><span class="cx">
</span><del>- current.updateFocusAppearanceAfterAttachIfNeeded();
</del><ins>+ current.clearNeedsStyleRecalc();
+ current.clearChildNeedsStyleRecalc();
</ins><span class="cx">
</span><span class="cx"> if (current.hasCustomStyleResolveCallbacks())
</span><span class="cx"> current.didAttachRenderers();
</span><span class="lines">@@ -884,7 +910,9 @@
</span><span class="cx"> if (inheritedStyle && (change >= Inherit || current.needsStyleRecalc()))
</span><span class="cx"> change = resolveLocal(current, inheritedStyle, renderTreePosition, change);
</span><span class="cx">
</span><del>- if (change != Detach) {
</del><ins>+ RenderStyle* style = current.renderStyle();
+
+ if (change != Detach && style) {
</ins><span class="cx"> StyleResolverParentPusher parentPusher(&current);
</span><span class="cx">
</span><span class="cx"> if (ShadowRoot* shadowRoot = current.shadowRoot()) {
</span><span class="lines">@@ -917,7 +945,7 @@
</span><span class="cx"> childElement->setNeedsStyleRecalc();
</span><span class="cx"> if (change >= Inherit || childElement->childNeedsStyleRecalc() || childElement->needsStyleRecalc()) {
</span><span class="cx"> parentPusher.push();
</span><del>- resolveTree(*childElement, current.renderStyle(), childRenderTreePosition, change);
</del><ins>+ resolveTree(*childElement, style, childRenderTreePosition, change);
</ins><span class="cx"> }
</span><span class="cx"> forceCheckOfNextElementSibling = childRulesChanged && hasDirectAdjacentRules;
</span><span class="cx"> forceCheckOfAnyElementSibling = forceCheckOfAnyElementSibling || (childRulesChanged && hasIndirectAdjacentRules);
</span><span class="lines">@@ -925,6 +953,8 @@
</span><span class="cx">
</span><span class="cx"> updateBeforeOrAfterPseudoElement(current, change, AFTER, childRenderTreePosition);
</span><span class="cx"> }
</span><ins>+ if (change != Detach && !style)
+ resetStyleForNonRenderedDescendants(current);
</ins><span class="cx">
</span><span class="cx"> current.clearNeedsStyleRecalc();
</span><span class="cx"> current.clearChildNeedsStyleRecalc();
</span></span></pre>
</div>
</div>
</body>
</html>