<!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>[161195] 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/161195">161195</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-01-01 13:20:51 -0800 (Wed, 01 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Do less synchronous render tree construction
https://bugs.webkit.org/show_bug.cgi?id=126359
Source/WebCore:
Reviewed by Anders Carlsson.
Remove some now-unnecessary attachRenderTree calls.
* html/HTMLDetailsElement.cpp:
(WebCore::HTMLDetailsElement::parseAttribute):
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::parseAttribute):
* html/HTMLObjectElement.cpp:
(WebCore::HTMLObjectElement::renderFallbackContent):
* html/HTMLPlugInElement.cpp:
(WebCore::HTMLPlugInElement::didAddUserAgentShadowRoot):
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::willRecalcStyle):
(WebCore::HTMLPlugInImageElement::createShadowIFrameSubtree):
(WebCore::HTMLPlugInImageElement::restartSnapshottedPlugIn):
* html/HTMLViewSourceDocument.cpp:
(WebCore::HTMLViewSourceDocument::createContainingTable):
(WebCore::HTMLViewSourceDocument::addSpanWithClassName):
(WebCore::HTMLViewSourceDocument::addLine):
(WebCore::HTMLViewSourceDocument::finishLine):
(WebCore::HTMLViewSourceDocument::addBase):
(WebCore::HTMLViewSourceDocument::addLink):
* xml/XMLErrors.cpp:
(WebCore::XMLErrors::insertErrorMessageBlock):
LayoutTests:
* fast/html/object-image-nested-fallback.html: Update test to work with asynchronous load failures.
* fast/overflow/overflow-height-float-not-removed-crash3-expected.txt: Whitespace change.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasthtmlobjectimagenestedfallbackhtml">trunk/LayoutTests/fast/html/object-image-nested-fallback.html</a></li>
<li><a href="#trunkLayoutTestsfastoverflowoverflowheightfloatnotremovedcrash3expectedtxt">trunk/LayoutTests/fast/overflow/overflow-height-float-not-removed-crash3-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLDetailsElementcpp">trunk/Source/WebCore/html/HTMLDetailsElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementcpp">trunk/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLObjectElementcpp">trunk/Source/WebCore/html/HTMLObjectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInElementcpp">trunk/Source/WebCore/html/HTMLPlugInElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementcpp">trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLViewSourceDocumentcpp">trunk/Source/WebCore/html/HTMLViewSourceDocument.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXMLErrorscpp">trunk/Source/WebCore/xml/XMLErrors.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (161194 => 161195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-01 19:53:21 UTC (rev 161194)
+++ trunk/LayoutTests/ChangeLog 2014-01-01 21:20:51 UTC (rev 161195)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2014-01-01 Antti Koivisto <antti@apple.com>
+
+ Do less synchronous render tree construction
+ https://bugs.webkit.org/show_bug.cgi?id=126359
+
+ * fast/html/object-image-nested-fallback.html: Update test to work with asynchronous load failures.
+ * fast/overflow/overflow-height-float-not-removed-crash3-expected.txt: Whitespace change.
+
</ins><span class="cx"> 2014-01-01 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed GTK gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsfasthtmlobjectimagenestedfallbackhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/html/object-image-nested-fallback.html (161194 => 161195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/html/object-image-nested-fallback.html 2014-01-01 19:53:21 UTC (rev 161194)
+++ trunk/LayoutTests/fast/html/object-image-nested-fallback.html 2014-01-01 21:20:51 UTC (rev 161195)
</span><span class="lines">@@ -1,12 +1,18 @@
</span><span class="cx"> <html>
</span><span class="cx"> <script>
</span><del>- if (window.testRunner)
</del><ins>+ if (window.testRunner) {
</ins><span class="cx"> testRunner.dumpAsText();
</span><ins>+ testRunner.waitUntilDone();
+ }
+ function done() {
+ if (testRunner)
+ testRunner.notifyDone();
+ }
</ins><span class="cx"> </script>
</span><del>- <body>
</del><ins>+ <body>
</ins><span class="cx"> <object type="image/png" data="this.object.does.not.exist.dtd">
</span><span class="cx"> <object type="image/png" data="this.object.does.not.exist.dtd">
</span><del>- <object type="image/png" data="this.object.does.not.exist.dtd">PASS when no crash occurs.</object>
</del><ins>+ <object type="image/png" data="this.object.does.not.exist.dtd" onerror="done()">PASS when no crash occurs.</object>
</ins><span class="cx"> </object>
</span><span class="cx"> </object>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestsfastoverflowoverflowheightfloatnotremovedcrash3expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/overflow/overflow-height-float-not-removed-crash3-expected.txt (161194 => 161195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/overflow/overflow-height-float-not-removed-crash3-expected.txt 2014-01-01 19:53:21 UTC (rev 161194)
+++ trunk/LayoutTests/fast/overflow/overflow-height-float-not-removed-crash3-expected.txt 2014-01-01 21:20:51 UTC (rev 161195)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><span class="cx"> Test passes if it does not crash.
</span><span class="cx"> sometextsometextsometextsometextsometextsometext
</span><del>-
</del><ins>+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161194 => 161195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-01 19:53:21 UTC (rev 161194)
+++ trunk/Source/WebCore/ChangeLog 2014-01-01 21:20:51 UTC (rev 161195)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-01-01 Antti Koivisto <antti@apple.com>
+
+ Do less synchronous render tree construction
+ https://bugs.webkit.org/show_bug.cgi?id=126359
+
+ Reviewed by Anders Carlsson.
+
+ Remove some now-unnecessary attachRenderTree calls.
+
+ * html/HTMLDetailsElement.cpp:
+ (WebCore::HTMLDetailsElement::parseAttribute):
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::parseAttribute):
+ * html/HTMLObjectElement.cpp:
+ (WebCore::HTMLObjectElement::renderFallbackContent):
+ * html/HTMLPlugInElement.cpp:
+ (WebCore::HTMLPlugInElement::didAddUserAgentShadowRoot):
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::willRecalcStyle):
+ (WebCore::HTMLPlugInImageElement::createShadowIFrameSubtree):
+ (WebCore::HTMLPlugInImageElement::restartSnapshottedPlugIn):
+ * html/HTMLViewSourceDocument.cpp:
+ (WebCore::HTMLViewSourceDocument::createContainingTable):
+ (WebCore::HTMLViewSourceDocument::addSpanWithClassName):
+ (WebCore::HTMLViewSourceDocument::addLine):
+ (WebCore::HTMLViewSourceDocument::finishLine):
+ (WebCore::HTMLViewSourceDocument::addBase):
+ (WebCore::HTMLViewSourceDocument::addLink):
+ * xml/XMLErrors.cpp:
+ (WebCore::XMLErrors::insertErrorMessageBlock):
+
</ins><span class="cx"> 2014-01-01 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Updating the scrolling tree should use references to state nodes
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDetailsElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDetailsElement.cpp (161194 => 161195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDetailsElement.cpp 2014-01-01 19:53:21 UTC (rev 161194)
+++ trunk/Source/WebCore/html/HTMLDetailsElement.cpp 2014-01-01 21:20:51 UTC (rev 161195)
</span><span class="lines">@@ -136,8 +136,8 @@
</span><span class="cx"> if (name == openAttr) {
</span><span class="cx"> bool oldValue = m_isOpen;
</span><span class="cx"> m_isOpen = !value.isNull();
</span><del>- if (oldValue != m_isOpen && renderer())
- Style::reattachRenderTree(*this);
</del><ins>+ if (oldValue != m_isOpen)
+ setNeedsStyleRecalc(ReconstructRenderTree);
</ins><span class="cx"> } else
</span><span class="cx"> HTMLElement::parseAttribute(name, value);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (161194 => 161195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2014-01-01 19:53:21 UTC (rev 161194)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2014-01-01 21:20:51 UTC (rev 161195)
</span><span class="lines">@@ -682,11 +682,11 @@
</span><span class="cx"> } else if (name == resultsAttr) {
</span><span class="cx"> int oldResults = m_maxResults;
</span><span class="cx"> m_maxResults = !value.isNull() ? std::min(value.toInt(), maxSavedResults) : -1;
</span><del>- // FIXME: Detaching just for maxResults change is not ideal. We should figure out the right
- // time to relayout for this change.
- if (m_maxResults != oldResults && (m_maxResults <= 0 || oldResults <= 0) && renderer())
- Style::reattachRenderTree(*this);
- setNeedsStyleRecalc();
</del><ins>+
+ if (m_maxResults != oldResults && (m_maxResults <= 0 || oldResults <= 0))
+ setNeedsStyleRecalc(ReconstructRenderTree);
+ else
+ setNeedsStyleRecalc();
</ins><span class="cx"> FeatureObserver::observe(&document(), FeatureObserver::ResultsAttribute);
</span><span class="cx"> } else if (name == autosaveAttr) {
</span><span class="cx"> setNeedsStyleRecalc();
</span><span class="lines">@@ -734,20 +734,15 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(INPUT_SPEECH)
</span><span class="cx"> else if (name == webkitspeechAttr) {
</span><del>- if (renderer()) {
- // This renderer and its children have quite different layouts and styles depending on
- // whether the speech button is visible or not. So we reset the whole thing and recreate
- // to get the right styles and layout.
- Style::detachRenderTree(*this);
- m_inputType->destroyShadowSubtree();
- m_inputType->createShadowSubtree();
- Style::attachRenderTree(*this);
- } else {
- m_inputType->destroyShadowSubtree();
- m_inputType->createShadowSubtree();
- }
</del><ins>+ m_inputType->destroyShadowSubtree();
+ m_inputType->createShadowSubtree();
+
+ // This renderer and its children have quite different layouts and styles depending on
+ // whether the speech button is visible or not. So we reset the whole thing and recreate
+ // to get the right styles and layout.
+ setNeedsStyleRecalc(ReconstructRenderTree);
+
</ins><span class="cx"> setFormControlValueMatchesRenderer(false);
</span><del>- setNeedsStyleRecalc();
</del><span class="cx"> FeatureObserver::observe(&document(), FeatureObserver::PrefixedSpeechAttribute);
</span><span class="cx"> } else if (name == onwebkitspeechchangeAttr)
</span><span class="cx"> setAttributeEventListener(eventNames().webkitspeechchangeEvent, name, value);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLObjectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLObjectElement.cpp (161194 => 161195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLObjectElement.cpp 2014-01-01 19:53:21 UTC (rev 161194)
+++ trunk/Source/WebCore/html/HTMLObjectElement.cpp 2014-01-01 21:20:51 UTC (rev 161195)
</span><span class="lines">@@ -373,21 +373,19 @@
</span><span class="cx"> if (!inDocument())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ setNeedsStyleRecalc(ReconstructRenderTree);
+
</ins><span class="cx"> // Before we give up and use fallback content, check to see if this is a MIME type issue.
</span><span class="cx"> if (m_imageLoader && m_imageLoader->image() && m_imageLoader->image()->status() != CachedResource::LoadError) {
</span><span class="cx"> m_serviceType = m_imageLoader->image()->response().mimeType();
</span><span class="cx"> if (!isImageType()) {
</span><span class="cx"> // If we don't think we have an image type anymore, then clear the image from the loader.
</span><span class="cx"> m_imageLoader->setImage(0);
</span><del>- Style::reattachRenderTree(*this);
</del><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_useFallbackContent = true;
</span><del>-
- // FIXME: Style gets recalculated which is suboptimal.
- Style::reattachRenderTree(*this);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: This should be removed, all callers are almost certainly wrong.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInElement.cpp (161194 => 161195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInElement.cpp 2014-01-01 19:53:21 UTC (rev 161194)
+++ trunk/Source/WebCore/html/HTMLPlugInElement.cpp 2014-01-01 21:20:51 UTC (rev 161195)
</span><span class="lines">@@ -309,7 +309,7 @@
</span><span class="cx"> root->setResetStyleInheritance(true);
</span><span class="cx"> if (m_pluginReplacement->installReplacement(root)) {
</span><span class="cx"> setDisplayState(DisplayingPluginReplacement);
</span><del>- Style::reattachRenderTree(*this);
</del><ins>+ setNeedsStyleRecalc(ReconstructRenderTree);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (161194 => 161195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2014-01-01 19:53:21 UTC (rev 161194)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2014-01-01 21:20:51 UTC (rev 161195)
</span><span class="lines">@@ -238,9 +238,10 @@
</span><span class="cx">
</span><span class="cx"> bool HTMLPlugInImageElement::willRecalcStyle(Style::Change)
</span><span class="cx"> {
</span><del>- // FIXME: Why is this necessary? Manual re-attach is almost always wrong.
</del><ins>+ // FIXME: There shoudn't be need to force render tree reconstruction here.
+ // It is only done because loading and load event dispatching is tied to render tree construction.
</ins><span class="cx"> if (!useFallbackContent() && needsWidgetUpdate() && renderer() && !isImageType() && (displayState() != DisplayingSnapshot))
</span><del>- Style::reattachRenderTree(*this);
</del><ins>+ setNeedsStyleRecalc(ReconstructRenderTree);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -463,9 +464,6 @@
</span><span class="cx"> // Disable frame flattening for this iframe.
</span><span class="cx"> iframeElement->setAttribute(HTMLNames::scrollingAttr, AtomicString("no", AtomicString::ConstructFromLiteral));
</span><span class="cx"> shadowElement->appendChild(iframeElement, ASSERT_NO_EXCEPTION);
</span><del>-
- if (renderer())
- Style::reattachRenderTree(*this);
</del><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -572,7 +570,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> setDisplayState(Restarting);
</span><del>- Style::reattachRenderTree(*this);
</del><ins>+ setNeedsStyleRecalc(ReconstructRenderTree);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLPlugInImageElement::dispatchPendingMouseClick()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLViewSourceDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLViewSourceDocument.cpp (161194 => 161195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLViewSourceDocument.cpp 2014-01-01 19:53:21 UTC (rev 161194)
+++ trunk/Source/WebCore/html/HTMLViewSourceDocument.cpp 2014-01-01 21:20:51 UTC (rev 161195)
</span><span class="lines">@@ -80,8 +80,6 @@
</span><span class="cx"> m_tbody = HTMLTableSectionElement::create(tbodyTag, *this);
</span><span class="cx"> table->parserAppendChild(m_tbody);
</span><span class="cx"> m_current = m_tbody;
</span><del>-
- Style::attachRenderTree(*html);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLViewSourceDocument::addSource(const String& source, HTMLToken& token)
</span><span class="lines">@@ -179,7 +177,6 @@
</span><span class="cx"> RefPtr<HTMLElement> span = HTMLElement::create(spanTag, *this);
</span><span class="cx"> span->setAttribute(classAttr, className);
</span><span class="cx"> m_current->parserAppendChild(span);
</span><del>- Style::attachRenderTree(*span);
</del><span class="cx"> return span.release();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -188,25 +185,21 @@
</span><span class="cx"> // Create a table row.
</span><span class="cx"> RefPtr<HTMLTableRowElement> trow = HTMLTableRowElement::create(*this);
</span><span class="cx"> m_tbody->parserAppendChild(trow);
</span><del>- Style::reattachRenderTree(*trow);
</del><span class="cx">
</span><span class="cx"> // Create a cell that will hold the line number (it is generated in the stylesheet using counters).
</span><span class="cx"> RefPtr<HTMLTableCellElement> td = HTMLTableCellElement::create(tdTag, *this);
</span><span class="cx"> td->setAttribute(classAttr, "webkit-line-number");
</span><span class="cx"> trow->parserAppendChild(td);
</span><del>- Style::attachRenderTree(*td);
</del><span class="cx">
</span><span class="cx"> // Create a second cell for the line contents
</span><span class="cx"> td = HTMLTableCellElement::create(tdTag, *this);
</span><span class="cx"> td->setAttribute(classAttr, "webkit-line-content");
</span><span class="cx"> trow->parserAppendChild(td);
</span><del>- Style::attachRenderTree(*td);
</del><span class="cx"> m_current = m_td = td;
</span><span class="cx">
</span><span class="cx"> #ifdef DEBUG_LINE_NUMBERS
</span><span class="cx"> RefPtr<Text> lineNumberText = Text::create(*this, String::number(parser()->lineNumber() + 1) + " ");
</span><span class="cx"> td->addChild(lineNumberText);
</span><del>- Style::attachRenderTree(lineNumberText.get());
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Open up the needed spans.
</span><span class="lines">@@ -222,7 +215,6 @@
</span><span class="cx"> if (!m_current->hasChildNodes()) {
</span><span class="cx"> RefPtr<HTMLBRElement> br = HTMLBRElement::create(*this);
</span><span class="cx"> m_current->parserAppendChild(br);
</span><del>- Style::attachRenderTree(*br);
</del><span class="cx"> }
</span><span class="cx"> m_current = m_tbody;
</span><span class="cx"> }
</span><span class="lines">@@ -278,7 +270,6 @@
</span><span class="cx"> RefPtr<HTMLBaseElement> base = HTMLBaseElement::create(baseTag, *this);
</span><span class="cx"> base->setAttribute(hrefAttr, href);
</span><span class="cx"> m_current->parserAppendChild(base);
</span><del>- Style::attachRenderTree(*base);
</del><span class="cx"> return base.release();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -298,7 +289,6 @@
</span><span class="cx"> anchor->setAttribute(targetAttr, "_blank");
</span><span class="cx"> anchor->setAttribute(hrefAttr, url);
</span><span class="cx"> m_current->parserAppendChild(anchor);
</span><del>- Style::attachRenderTree(*anchor);
</del><span class="cx"> return anchor.release();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLErrorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLErrors.cpp (161194 => 161195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLErrors.cpp 2014-01-01 19:53:21 UTC (rev 161194)
+++ trunk/Source/WebCore/xml/XMLErrors.cpp 2014-01-01 21:20:51 UTC (rev 161195)
</span><span class="lines">@@ -140,11 +140,6 @@
</span><span class="cx"> body->parserAppendChild(documentElement);
</span><span class="cx"> m_document->parserAppendChild(rootElement.get());
</span><span class="cx">
</span><del>- if (m_document->hasLivingRenderTree())
- // In general, rootElement shouldn't be attached right now, but it will be if there is a style element
- // in the SVG content.
- Style::reattachRenderTree(*rootElement);
-
</del><span class="cx"> documentElement = body.get();
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>