<!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>[166173] 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/166173">166173</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-03-24 09:49:39 -0700 (Mon, 24 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Invalidate sibling text node style when needed instead of attaching synchronously
https://bugs.webkit.org/show_bug.cgi?id=130590
Reviewed by Andreas Kling.
Make things simpler.
* style/StyleResolveTree.cpp:
(WebCore::Style::invalidateWhitespaceOnlyTextSiblingsAfterAttachIfNeeded):
Just invalidate instead of calling attach directly.
Rename to match.
(WebCore::Style::textRendererIsNeeded):
(WebCore::Style::createTextRendererIfNeeded):
Move all testing to textRendererIsNeeded.
(WebCore::Style::updateTextRendererAfterContentChange):
Call resolveTextNode instead of re-implementing the same thing.
(WebCore::Style::resolveLocal):
(WebCore::Style::resolveTextNode):
Avoid unnecessary reattaching.
Rename for consistency.
(WebCore::Style::resolveShadowTree):
(WebCore::Style::resolveTree):</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166172 => 166173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-24 16:35:40 UTC (rev 166172)
+++ trunk/Source/WebCore/ChangeLog 2014-03-24 16:49:39 UTC (rev 166173)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-03-24 Antti Koivisto <antti@apple.com>
+
+ Invalidate sibling text node style when needed instead of attaching synchronously
+ https://bugs.webkit.org/show_bug.cgi?id=130590
+
+ Reviewed by Andreas Kling.
+
+ Make things simpler.
+
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::invalidateWhitespaceOnlyTextSiblingsAfterAttachIfNeeded):
+
+ Just invalidate instead of calling attach directly.
+ Rename to match.
+
+ (WebCore::Style::textRendererIsNeeded):
+ (WebCore::Style::createTextRendererIfNeeded):
+
+ Move all testing to textRendererIsNeeded.
+
+ (WebCore::Style::updateTextRendererAfterContentChange):
+
+ Call resolveTextNode instead of re-implementing the same thing.
+
+ (WebCore::Style::resolveLocal):
+ (WebCore::Style::resolveTextNode):
+
+ Avoid unnecessary reattaching.
+ Rename for consistency.
+
+ (WebCore::Style::resolveShadowTree):
+ (WebCore::Style::resolveTree):
+
</ins><span class="cx"> 2014-03-24 Zsolt Borbely <zsborbely.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Fix !ENABLE(VIDEO) build
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (166172 => 166173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-03-24 16:35:40 UTC (rev 166172)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-03-24 16:49:39 UTC (rev 166173)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> static void attachRenderTree(Element&, ContainerNode& renderingParentNode, PassRefPtr<RenderStyle>);
</span><span class="cx"> static void attachTextRenderer(Text&, ContainerNode& renderingParentNode);
</span><span class="cx"> static void detachRenderTree(Element&, DetachType);
</span><ins>+static void resolveTextNode(Text&, ContainerNode& renderingParentNode);
</ins><span class="cx"> static void resolveTree(Element&, ContainerNode& renderingParentNode, Change);
</span><span class="cx">
</span><span class="cx"> Change determineChange(const RenderStyle* s1, const RenderStyle* s2)
</span><span class="lines">@@ -294,15 +295,14 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void reattachTextRenderersForWhitespaceOnlySiblingsAfterAttachIfNeeded(Node& current, ContainerNode& renderingParentNode)
</del><ins>+static void invalidateWhitespaceOnlyTextSiblingsAfterAttachIfNeeded(Node& current)
</ins><span class="cx"> {
</span><span class="cx"> if (isInsertionPoint(current))
</span><span class="cx"> return;
</span><span class="cx"> // This function finds sibling text renderers where the results of textRendererIsNeeded may have changed as a result of
</span><span class="cx"> // the current node gaining or losing the renderer. This can only affect white space text nodes.
</span><span class="cx"> for (Node* sibling = current.nextSibling(); sibling; sibling = sibling->nextSibling()) {
</span><del>- // Siblings haven't been attached yet. They will be handled normally when they are.
- if (sibling->styleChangeType() == ReconstructRenderTree)
</del><ins>+ if (sibling->needsStyleRecalc())
</ins><span class="cx"> return;
</span><span class="cx"> if (sibling->isElementNode()) {
</span><span class="cx"> // Text renderers beyond rendered elements can't be affected.
</span><span class="lines">@@ -312,33 +312,35 @@
</span><span class="cx"> }
</span><span class="cx"> if (!sibling->isTextNode())
</span><span class="cx"> continue;
</span><del>- Text& textSibling = *toText(sibling);
- if (!textSibling.length() || !textSibling.containsOnlyWhitespace())
- return;
- Text& whitespaceTextSibling = textSibling;
- bool hadRenderer = whitespaceTextSibling.renderer();
- detachTextRenderer(whitespaceTextSibling);
- attachTextRenderer(whitespaceTextSibling, renderingParentNode);
- // No changes, futher renderers can't be affected.
- if (hadRenderer == !!whitespaceTextSibling.renderer())
- return;
</del><ins>+ Text& textSibling = toText(*sibling);
+ if (!textSibling.containsOnlyWhitespace())
+ continue;
+ textSibling.setNeedsStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool textRendererIsNeeded(const Text& textNode, const RenderObject& parentRenderer, const RenderStyle& style)
</del><ins>+static bool textRendererIsNeeded(const Text& textNode, ContainerNode& renderingParentNode)
</ins><span class="cx"> {
</span><ins>+ if (!renderingParentNode.renderer())
+ return false;
+ RenderElement& parentRenderer = *renderingParentNode.renderer();
+ if (!parentRenderer.canHaveChildren())
+ return false;
+ if (!renderingParentNode.childShouldCreateRenderer(textNode))
+ return false;
+
</ins><span class="cx"> if (textNode.isEditingText())
</span><span class="cx"> return true;
</span><span class="cx"> if (!textNode.length())
</span><span class="cx"> return false;
</span><del>- if (style.display() == NONE)
</del><ins>+ if (parentRenderer.style().display() == NONE)
</ins><span class="cx"> return false;
</span><span class="cx"> if (!textNode.containsOnlyWhitespace())
</span><span class="cx"> return true;
</span><span class="cx"> // This text node has nothing but white space. We may still need a renderer in some cases.
</span><span class="cx"> if (parentRenderer.isTable() || parentRenderer.isTableRow() || parentRenderer.isTableSection() || parentRenderer.isRenderTableCol() || parentRenderer.isFrameSet())
</span><span class="cx"> return false;
</span><del>- if (style.preserveNewline()) // pre/pre-wrap/pre-line always make renderers.
</del><ins>+ if (parentRenderer.style().preserveNewline()) // pre/pre-wrap/pre-line always make renderers.
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> RenderObject* previousRenderer = previousSiblingRenderer(textNode);
</span><span class="lines">@@ -353,7 +355,7 @@
</span><span class="cx"> if (parentRenderer.isRenderBlock() && !parentRenderer.childrenInline() && (!previousRenderer || !previousRenderer->isInline()))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RenderObject* first = toRenderElement(parentRenderer).firstChild();
</del><ins>+ RenderObject* first = parentRenderer.firstChild();
</ins><span class="cx"> while (first && first->isFloatingOrOutOfFlowPositioned())
</span><span class="cx"> first = first->nextSibling();
</span><span class="cx"> RenderObject* nextRenderer = nextSiblingRenderer(textNode, *textNode.parentNode());
</span><span class="lines">@@ -369,31 +371,25 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!textNode.renderer());
</span><span class="cx">
</span><del>- RenderElement* parentRenderer = renderingParentNode.renderer();
- if (!parentRenderer || !parentRenderer->canHaveChildren())
</del><ins>+ if (!textRendererIsNeeded(textNode, renderingParentNode))
</ins><span class="cx"> return;
</span><del>- if (!renderingParentNode.childShouldCreateRenderer(textNode))
- return;
</del><ins>+ RenderElement& parentRenderer = *renderingParentNode.renderer();
+ const auto& style = parentRenderer.style();
</ins><span class="cx">
</span><del>- const auto& style = parentRenderer->style();
-
- if (!textRendererIsNeeded(textNode, *parentRenderer, style))
- return;
-
</del><span class="cx"> auto newRenderer = textNode.createTextRenderer(style);
</span><span class="cx"> ASSERT(newRenderer);
</span><span class="cx">
</span><del>- if (!parentRenderer->isChildAllowed(*newRenderer, style))
</del><ins>+ if (!parentRenderer.isChildAllowed(*newRenderer, style))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Make sure the RenderObject already knows it is going to be added to a RenderFlowThread before we set the style
</span><span class="cx"> // for the first time. Otherwise code using inRenderFlowThread() in the styleWillChange and styleDidChange will fail.
</span><del>- newRenderer->setFlowThreadState(parentRenderer->flowThreadState());
</del><ins>+ newRenderer->setFlowThreadState(parentRenderer.flowThreadState());
</ins><span class="cx">
</span><span class="cx"> RenderObject* nextRenderer = nextSiblingRenderer(textNode, renderingParentNode);
</span><span class="cx"> textNode.setRenderer(newRenderer.get());
</span><span class="cx"> // Parent takes care of the animations, no need to call setAnimatableStyle.
</span><del>- parentRenderer->addChild(newRenderer.leakPtr(), nextRenderer);
</del><ins>+ parentRenderer.addChild(newRenderer.leakPtr(), nextRenderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void attachTextRenderer(Text& textNode, ContainerNode& renderingParent)
</span><span class="lines">@@ -412,22 +408,15 @@
</span><span class="cx">
</span><span class="cx"> void updateTextRendererAfterContentChange(Text& textNode, unsigned offsetOfReplacedData, unsigned lengthOfReplacedData)
</span><span class="cx"> {
</span><del>- RenderText* textRenderer = textNode.renderer();
</del><span class="cx"> ContainerNode* renderingParentNode = NodeRenderingTraversal::parent(&textNode);
</span><span class="cx"> if (!renderingParentNode)
</span><span class="cx"> return;
</span><del>- if (!textRenderer) {
- attachTextRenderer(textNode, *renderingParentNode);
- reattachTextRenderersForWhitespaceOnlySiblingsAfterAttachIfNeeded(textNode, *renderingParentNode);
- return;
- }
- if (!textRendererIsNeeded(textNode, *renderingParentNode->renderer(), textRenderer->style())) {
- detachTextRenderer(textNode);
- attachTextRenderer(textNode, *renderingParentNode);
- reattachTextRenderersForWhitespaceOnlySiblingsAfterAttachIfNeeded(textNode, *renderingParentNode);
- return;
- }
- textRenderer->setTextWithOffset(textNode.dataImpl(), offsetOfReplacedData, lengthOfReplacedData);
</del><ins>+
+ bool hadRenderer = textNode.renderer();
+ resolveTextNode(textNode, *renderingParentNode);
+
+ if (hadRenderer && textNode.renderer())
+ textNode.renderer()->setTextWithOffset(textNode.dataImpl(), offsetOfReplacedData, lengthOfReplacedData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void attachChildren(ContainerNode& current, ContainerNode& renderingParentNode)
</span><span class="lines">@@ -678,7 +667,7 @@
</span><span class="cx"> if (current.renderer() || current.inNamedFlow())
</span><span class="cx"> detachRenderTree(current, ReattachDetach);
</span><span class="cx"> attachRenderTree(current, renderingParentNode, newStyle.release());
</span><del>- reattachTextRenderersForWhitespaceOnlySiblingsAfterAttachIfNeeded(current, renderingParentNode);
</del><ins>+ invalidateWhitespaceOnlyTextSiblingsAfterAttachIfNeeded(current);
</ins><span class="cx">
</span><span class="cx"> return Detach;
</span><span class="cx"> }
</span><span class="lines">@@ -709,26 +698,30 @@
</span><span class="cx"> return localChange;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void updateTextStyle(Text& text, ContainerNode& renderingParentNode)
</del><ins>+void resolveTextNode(Text& text, ContainerNode& renderingParentNode)
</ins><span class="cx"> {
</span><del>- RenderText* renderer = text.renderer();
</del><ins>+ text.clearNeedsStyleRecalc();
</ins><span class="cx">
</span><del>- if (!text.needsStyleRecalc())
</del><ins>+ bool hasRenderer = text.renderer();
+ bool needsRenderer = textRendererIsNeeded(text, renderingParentNode);
+ if (hasRenderer) {
+ if (needsRenderer)
+ return;
+ detachTextRenderer(text);
+ invalidateWhitespaceOnlyTextSiblingsAfterAttachIfNeeded(text);
</ins><span class="cx"> return;
</span><del>- if (renderer)
- renderer->setText(text.dataImpl());
- else {
- attachTextRenderer(text, renderingParentNode);
- reattachTextRenderersForWhitespaceOnlySiblingsAfterAttachIfNeeded(text, renderingParentNode);
</del><span class="cx"> }
</span><del>- text.clearNeedsStyleRecalc();
</del><ins>+ if (!needsRenderer)
+ return;
+ attachTextRenderer(text, renderingParentNode);
+ invalidateWhitespaceOnlyTextSiblingsAfterAttachIfNeeded(text);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void resolveShadowTree(ShadowRoot& shadowRoot, Style::Change change)
</span><span class="cx"> {
</span><span class="cx"> for (Node* child = shadowRoot.firstChild(); child; child = child->nextSibling()) {
</span><del>- if (child->isTextNode()) {
- updateTextStyle(*toText(child), *shadowRoot.hostElement());
</del><ins>+ if (child->isTextNode() && child->needsStyleRecalc()) {
+ resolveTextNode(*toText(child), *shadowRoot.hostElement());
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> if (child->isElementNode())
</span><span class="lines">@@ -844,8 +837,8 @@
</span><span class="cx"> bool forceCheckOfNextElementSibling = false;
</span><span class="cx"> bool forceCheckOfAnyElementSibling = false;
</span><span class="cx"> for (Node* child = current.firstChild(); child; child = child->nextSibling()) {
</span><del>- if (child->isTextNode()) {
- updateTextStyle(*toText(child), current);
</del><ins>+ if (child->isTextNode() && child->needsStyleRecalc()) {
+ resolveTextNode(*toText(child), current);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> if (!child->isElementNode())
</span></span></pre>
</div>
</div>
</body>
</html>