<!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>[161208] 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/161208">161208</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-01-02 07:51:59 -0800 (Thu, 02 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Always resolve style from root
https://bugs.webkit.org/show_bug.cgi?id=126380
Reviewed by Andreas Kling.
Forced style resolve that does not start from the root is never really correct.
Remove the few remaining instances.
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::setResetStyleInheritance):
Update style asynchronously.
* dom/ShadowRoot.h:
* dom/Text.h:
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::createElementRenderer):
(WebCore::HTMLPlugInImageElement::documentWillSuspendForPageCache):
(WebCore::HTMLPlugInImageElement::documentDidResumeFromPageCache):
Delete the render tree synchronously on suspend and rebuild it asynchronously on resume.
No need for m_customStyleForPageCache hack.
* html/HTMLPlugInImageElement.h:
Remove m_customStyleForPageCache.
* style/StyleResolveTree.cpp:
* style/StyleResolveTree.h:
Remove Element version of resolveTree from the interface.
* svg/SVGUseElement.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomShadowRootcpp">trunk/Source/WebCore/dom/ShadowRoot.cpp</a></li>
<li><a href="#trunkSourceWebCoredomShadowRooth">trunk/Source/WebCore/dom/ShadowRoot.h</a></li>
<li><a href="#trunkSourceWebCoredomTexth">trunk/Source/WebCore/dom/Text.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementcpp">trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementh">trunk/Source/WebCore/html/HTMLPlugInImageElement.h</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreeh">trunk/Source/WebCore/style/StyleResolveTree.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGUseElementh">trunk/Source/WebCore/svg/SVGUseElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161207 => 161208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-02 15:50:28 UTC (rev 161207)
+++ trunk/Source/WebCore/ChangeLog 2014-01-02 15:51:59 UTC (rev 161208)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2014-01-02 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><ins>+ Always resolve style from root
+ https://bugs.webkit.org/show_bug.cgi?id=126380
+
+ Reviewed by Andreas Kling.
+
+ Forced style resolve that does not start from the root is never really correct.
+ Remove the few remaining instances.
+
+ * dom/ShadowRoot.cpp:
+ (WebCore::ShadowRoot::setResetStyleInheritance):
+
+ Update style asynchronously.
+
+ * dom/ShadowRoot.h:
+ * dom/Text.h:
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::createElementRenderer):
+ (WebCore::HTMLPlugInImageElement::documentWillSuspendForPageCache):
+ (WebCore::HTMLPlugInImageElement::documentDidResumeFromPageCache):
+
+ Delete the render tree synchronously on suspend and rebuild it asynchronously on resume.
+ No need for m_customStyleForPageCache hack.
+
+ * html/HTMLPlugInImageElement.h:
+
+ Remove m_customStyleForPageCache.
+
+ * style/StyleResolveTree.cpp:
+ * style/StyleResolveTree.h:
+
+ Remove Element version of resolveTree from the interface.
+
+ * svg/SVGUseElement.h:
+
+2014-01-02 Antti Koivisto <antti@apple.com>
+
</ins><span class="cx"> Remove PlaceholderDocument
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126382
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (161207 => 161208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.cpp 2014-01-02 15:50:28 UTC (rev 161207)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp 2014-01-02 15:51:59 UTC (rev 161208)
</span><span class="lines">@@ -140,8 +140,8 @@
</span><span class="cx">
</span><span class="cx"> if (value != m_resetStyleInheritance) {
</span><span class="cx"> m_resetStyleInheritance = value;
</span><del>- if (renderer() && hostElement())
- Style::resolveTree(*hostElement(), Style::Force);
</del><ins>+ if (hostElement())
+ setNeedsStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.h (161207 => 161208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.h 2014-01-02 15:50:28 UTC (rev 161207)
+++ trunk/Source/WebCore/dom/ShadowRoot.h 2014-01-02 15:51:59 UTC (rev 161208)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include "DocumentFragment.h"
</span><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><del>-#include "StyleResolveTree.h"
</del><span class="cx"> #include "TreeScope.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoredomTexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Text.h (161207 => 161208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Text.h 2014-01-02 15:50:28 UTC (rev 161207)
+++ trunk/Source/WebCore/dom/Text.h 2014-01-02 15:51:59 UTC (rev 161208)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #include "CharacterData.h"
</span><span class="cx"> #include "RenderPtr.h"
</span><del>-#include "StyleResolveTree.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (161207 => 161208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2014-01-02 15:50:28 UTC (rev 161207)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2014-01-02 15:51:59 UTC (rev 161208)
</span><span class="lines">@@ -198,6 +198,8 @@
</span><span class="cx">
</span><span class="cx"> RenderPtr<RenderElement> HTMLPlugInImageElement::createElementRenderer(PassRef<RenderStyle> style)
</span><span class="cx"> {
</span><ins>+ ASSERT(!document().inPageCache());
+
</ins><span class="cx"> if (displayState() >= PreparingPluginReplacement)
</span><span class="cx"> return HTMLPlugInElement::createElementRenderer(std::move(style));
</span><span class="cx">
</span><span class="lines">@@ -309,32 +311,19 @@
</span><span class="cx">
</span><span class="cx"> void HTMLPlugInImageElement::documentWillSuspendForPageCache()
</span><span class="cx"> {
</span><del>- if (RenderStyle* renderStyle = this->renderStyle()) {
- m_customStyleForPageCache = RenderStyle::clone(renderStyle);
- m_customStyleForPageCache->setDisplay(NONE);
- Style::resolveTree(*this, Style::Force);
- }
</del><ins>+ if (renderer())
+ Style::detachRenderTree(*this);
</ins><span class="cx">
</span><span class="cx"> HTMLPlugInElement::documentWillSuspendForPageCache();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLPlugInImageElement::documentDidResumeFromPageCache()
</span><span class="cx"> {
</span><del>- if (m_customStyleForPageCache) {
- m_customStyleForPageCache = 0;
- Style::resolveTree(*this, Style::Force);
- }
</del><ins>+ setNeedsStyleRecalc(ReconstructRenderTree);
</ins><span class="cx">
</span><span class="cx"> HTMLPlugInElement::documentDidResumeFromPageCache();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<RenderStyle> HTMLPlugInImageElement::customStyleForRenderer()
-{
- if (!m_customStyleForPageCache)
- return document().ensureStyleResolver().styleForElement(this);
- return m_customStyleForPageCache;
-}
-
</del><span class="cx"> void HTMLPlugInImageElement::updateWidgetCallback(Node& node, unsigned)
</span><span class="cx"> {
</span><span class="cx"> toHTMLPlugInImageElement(node).updateWidgetIfNecessary();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.h (161207 => 161208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2014-01-02 15:50:28 UTC (rev 161207)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2014-01-02 15:51:59 UTC (rev 161208)
</span><span class="lines">@@ -127,8 +127,6 @@
</span><span class="cx"> virtual void documentWillSuspendForPageCache() OVERRIDE;
</span><span class="cx"> virtual void documentDidResumeFromPageCache() OVERRIDE;
</span><span class="cx">
</span><del>- virtual PassRefPtr<RenderStyle> customStyleForRenderer() OVERRIDE;
-
</del><span class="cx"> virtual bool isRestartedPlugin() const OVERRIDE { return m_isRestartedPlugin; }
</span><span class="cx"> virtual bool requestObject(const String& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues) OVERRIDE;
</span><span class="cx">
</span><span class="lines">@@ -158,7 +156,6 @@
</span><span class="cx"> bool m_needsWidgetUpdate;
</span><span class="cx"> bool m_shouldPreferPlugInsForImages;
</span><span class="cx"> bool m_needsDocumentActivationCallbacks;
</span><del>- RefPtr<RenderStyle> m_customStyleForPageCache;
</del><span class="cx"> RefPtr<MouseEvent> m_pendingClickEventFromSnapshot;
</span><span class="cx"> DeferrableOneShotTimer<HTMLPlugInImageElement> m_simulatedMouseClickTimer;
</span><span class="cx"> Timer<HTMLPlugInImageElement> m_removeSnapshotTimer;
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (161207 => 161208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-01-02 15:50:28 UTC (rev 161207)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-01-02 15:51:59 UTC (rev 161208)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> static void attachRenderTree(Element&, PassRefPtr<RenderStyle>);
</span><span class="cx"> static void attachTextRenderer(Text&);
</span><span class="cx"> static void detachRenderTree(Element&, DetachType);
</span><ins>+static void resolveTree(Element&, Change);
</ins><span class="cx">
</span><span class="cx"> Change determineChange(const RenderStyle* s1, const RenderStyle* s2, Settings* settings)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.h (161207 => 161208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.h 2014-01-02 15:50:28 UTC (rev 161207)
+++ trunk/Source/WebCore/style/StyleResolveTree.h 2014-01-02 15:51:59 UTC (rev 161208)
</span><span class="lines">@@ -38,12 +38,11 @@
</span><span class="cx">
</span><span class="cx"> enum Change { NoChange, NoInherit, Inherit, Detach, Force };
</span><span class="cx">
</span><del>-void resolveTree(Element&, Change);
</del><span class="cx"> void resolveTree(Document&, Change);
</span><span class="cx">
</span><span class="cx"> void detachRenderTree(Element&);
</span><del>-
</del><span class="cx"> void detachTextRenderer(Text&);
</span><ins>+
</ins><span class="cx"> void updateTextRendererAfterContentChange(Text&, unsigned offsetOfReplacedData, unsigned lengthOfReplacedData);
</span><span class="cx">
</span><span class="cx"> Change determineChange(const RenderStyle*, const RenderStyle*, Settings*);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGUseElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGUseElement.h (161207 => 161208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGUseElement.h 2014-01-02 15:50:28 UTC (rev 161207)
+++ trunk/Source/WebCore/svg/SVGUseElement.h 2014-01-02 15:51:59 UTC (rev 161208)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "SVGGraphicsElement.h"
</span><span class="cx"> #include "SVGNames.h"
</span><span class="cx"> #include "SVGURIReference.h"
</span><del>-#include "StyleResolveTree.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>