<!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>[160906] 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/160906">160906</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2013-12-20 05:47:42 -0800 (Fri, 20 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Devirtualize RenderElement::setStyle().
<https://webkit.org/b/126065>
setStyle() was only virtual in order to let RenderSVGBlock override
the display type in some cases. Devirtualized it and moved the fixup
logic to StyleResolver::adjustRenderStyle().
This hack had an evil twin in RenderElement::initializeStyle() that
also goes away. FIXME--!
Based on a Blink change by Elliott Sprehn.
Reviewed by Antti Koivisto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGBlockcpp">trunk/Source/WebCore/rendering/svg/RenderSVGBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGBlockh">trunk/Source/WebCore/rendering/svg/RenderSVGBlock.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160905 => 160906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-20 13:44:45 UTC (rev 160905)
+++ trunk/Source/WebCore/ChangeLog 2013-12-20 13:47:42 UTC (rev 160906)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-12-20 Andreas Kling <akling@apple.com>
+
+ Devirtualize RenderElement::setStyle().
+ <https://webkit.org/b/126065>
+
+ setStyle() was only virtual in order to let RenderSVGBlock override
+ the display type in some cases. Devirtualized it and moved the fixup
+ logic to StyleResolver::adjustRenderStyle().
+
+ This hack had an evil twin in RenderElement::initializeStyle() that
+ also goes away. FIXME--!
+
+ Based on a Blink change by Elliott Sprehn.
+
+ Reviewed by Antti Koivisto.
+
</ins><span class="cx"> 2013-12-20 Radu Stavila <stavila@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Regions] When changing flow-from/flow-into on :hover, elements overflowing the region are not correctly repainted
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (160905 => 160906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2013-12-20 13:44:45 UTC (rev 160905)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2013-12-20 13:47:42 UTC (rev 160906)
</span><span class="lines">@@ -1430,6 +1430,10 @@
</span><span class="cx"> // not be scaled again.
</span><span class="cx"> if (e->hasTagName(SVGNames::foreignObjectTag))
</span><span class="cx"> style.setEffectiveZoom(RenderStyle::initialZoom());
</span><ins>+
+ // SVG text layout code expects us to be a block-level style element.
+ if ((e->hasTagName(SVGNames::foreignObjectTag) || e->hasTagName(SVGNames::textTag)) && style.isDisplayInlineType())
+ style.setDisplay(BLOCK);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (160905 => 160906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2013-12-20 13:44:45 UTC (rev 160905)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2013-12-20 13:47:42 UTC (rev 160906)
</span><span class="lines">@@ -354,14 +354,6 @@
</span><span class="cx">
</span><span class="cx"> void RenderElement::initializeStyle()
</span><span class="cx"> {
</span><del>-#if ENABLE(SVG)
- // FIXME: This logic should be in a less ridiculous place. (This is mirrored from RenderSVGBlock::setStyle().)
- if (isRenderSVGBlock() && m_style->isDisplayInlineType()) {
- // SVG text layout code expects us to be a block-level style element.
- m_style->setDisplay(BLOCK);
- }
-#endif
-
</del><span class="cx"> styleWillChange(StyleDifferenceEqual, style());
</span><span class="cx">
</span><span class="cx"> m_hasInitializedStyle = true;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (160905 => 160906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2013-12-20 13:44:45 UTC (rev 160905)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2013-12-20 13:47:42 UTC (rev 160906)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> void initializeStyle();
</span><span class="cx">
</span><del>- virtual void setStyle(PassRef<RenderStyle>);
</del><ins>+ void setStyle(PassRef<RenderStyle>);
</ins><span class="cx"> // Called to update a style that is allowed to trigger animations.
</span><span class="cx"> void setAnimatableStyle(PassRef<RenderStyle>);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGBlock.cpp (160905 => 160906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGBlock.cpp 2013-12-20 13:44:45 UTC (rev 160905)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGBlock.cpp 2013-12-20 13:47:42 UTC (rev 160906)
</span><span class="lines">@@ -46,23 +46,6 @@
</span><span class="cx"> return borderRect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderSVGBlock::setStyle(PassRef<RenderStyle> style)
-{
- if (!style.get().isDisplayInlineType()) {
- RenderBlockFlow::setStyle(std::move(style));
- return;
- }
-
- Ref<RenderStyle> styleToInheritFrom(std::move(style));
-
- // SVG text layout code expects us to be a block-level style element.
- auto newStyle = RenderStyle::create();
- newStyle.get().inheritFrom(&styleToInheritFrom.get());
- newStyle.get().setDisplay(BLOCK);
-
- RenderBlockFlow::setStyle(std::move(newStyle));
-}
-
</del><span class="cx"> void RenderSVGBlock::updateFromStyle()
</span><span class="cx"> {
</span><span class="cx"> RenderBlockFlow::updateFromStyle();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGBlock.h (160905 => 160906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGBlock.h 2013-12-20 13:44:45 UTC (rev 160905)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGBlock.h 2013-12-20 13:47:42 UTC (rev 160906)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> private:
</span><span class="cx"> void element() const WTF_DELETED_FUNCTION;
</span><span class="cx">
</span><del>- virtual void setStyle(PassRef<RenderStyle>) OVERRIDE FINAL;
</del><span class="cx"> virtual void updateFromStyle() OVERRIDE FINAL;
</span><span class="cx">
</span><span class="cx"> virtual bool isRenderSVGBlock() const OVERRIDE FINAL { return true; };
</span></span></pre>
</div>
</div>
</body>
</html>