<!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>[208797] 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/208797">208797</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-11-16 10:08:30 -0800 (Wed, 16 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove getMutableCachedPseudoStyle
https://bugs.webkit.org/show_bug.cgi?id=164819
Reviewed by Zalan Bujtas.
It is only used by styleForFirstLetter.
* rendering/RenderBlock.cpp:
(WebCore::styleForFirstLetter):
Clone the original style before mutations.
(WebCore::RenderBlock::updateFirstLetterStyle):
(WebCore::RenderBlock::createFirstLetterRenderer):
Since we have a clone already just move it in place.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::getMutableCachedPseudoStyle): Deleted.
* rendering/RenderElement.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208796 => 208797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-16 18:07:25 UTC (rev 208796)
+++ trunk/Source/WebCore/ChangeLog 2016-11-16 18:08:30 UTC (rev 208797)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-11-16 Antti Koivisto <antti@apple.com>
+
+ Remove getMutableCachedPseudoStyle
+ https://bugs.webkit.org/show_bug.cgi?id=164819
+
+ Reviewed by Zalan Bujtas.
+
+ It is only used by styleForFirstLetter.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::styleForFirstLetter):
+
+ Clone the original style before mutations.
+
+ (WebCore::RenderBlock::updateFirstLetterStyle):
+ (WebCore::RenderBlock::createFirstLetterRenderer):
+
+ Since we have a clone already just move it in place.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::getMutableCachedPseudoStyle): Deleted.
+ * rendering/RenderElement.h:
+
</ins><span class="cx"> 2016-11-16 Romain Bellessort <romain.bellessort@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Readable Streams API] Implement ReadableByteStreamController close()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (208796 => 208797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-11-16 18:07:25 UTC (rev 208796)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-11-16 18:08:30 UTC (rev 208797)
</span><span class="lines">@@ -3050,52 +3050,52 @@
</span><span class="cx"> return firstLineBlock;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static const RenderStyle& styleForFirstLetter(RenderElement* firstLetterBlock, RenderObject* firstLetterContainer)
</del><ins>+static RenderStyle styleForFirstLetter(const RenderElement& firstLetterBlock, const RenderObject& firstLetterContainer)
</ins><span class="cx"> {
</span><del>- auto* pseudoStyle = firstLetterBlock->getMutableCachedPseudoStyle(FIRST_LETTER, &firstLetterContainer->firstLineStyle());
-
</del><ins>+ auto firstLetterStyle = RenderStyle::clone(*firstLetterBlock.getCachedPseudoStyle(FIRST_LETTER, &firstLetterContainer.firstLineStyle()));
+
</ins><span class="cx"> // If we have an initial letter drop that is >= 1, then we need to force floating to be on.
</span><del>- if (pseudoStyle->initialLetterDrop() >= 1 && !pseudoStyle->isFloating())
- pseudoStyle->setFloating(pseudoStyle->isLeftToRightDirection() ? LeftFloat : RightFloat);
</del><ins>+ if (firstLetterStyle.initialLetterDrop() >= 1 && !firstLetterStyle.isFloating())
+ firstLetterStyle.setFloating(firstLetterStyle.isLeftToRightDirection() ? LeftFloat : RightFloat);
</ins><span class="cx">
</span><span class="cx"> // We have to compute the correct font-size for the first-letter if it has an initial letter height set.
</span><del>- RenderObject* paragraph = firstLetterContainer->isRenderBlockFlow() ? firstLetterContainer : firstLetterContainer->containingBlock();
- if (pseudoStyle->initialLetterHeight() >= 1 && pseudoStyle->fontMetrics().hasCapHeight() && paragraph->style().fontMetrics().hasCapHeight()) {
</del><ins>+ auto* paragraph = firstLetterContainer.isRenderBlockFlow() ? &firstLetterContainer : firstLetterContainer.containingBlock();
+ if (firstLetterStyle.initialLetterHeight() >= 1 && firstLetterStyle.fontMetrics().hasCapHeight() && paragraph->style().fontMetrics().hasCapHeight()) {
</ins><span class="cx"> // FIXME: For ideographic baselines, we want to go from line edge to line edge. This is equivalent to (N-1)*line-height + the font height.
</span><span class="cx"> // We don't yet support ideographic baselines.
</span><span class="cx"> // For an N-line first-letter and for alphabetic baselines, the cap-height of the first letter needs to equal (N-1)*line-height of paragraph lines + cap-height of the paragraph
</span><span class="cx"> // Mathematically we can't rely on font-size, since font().height() doesn't necessarily match. For reliability, the best approach is simply to
</span><span class="cx"> // compare the final measured cap-heights of the two fonts in order to get to the closest possible value.
</span><del>- pseudoStyle->setLineBoxContain(LineBoxContainInitialLetter);
</del><ins>+ firstLetterStyle.setLineBoxContain(LineBoxContainInitialLetter);
</ins><span class="cx"> int lineHeight = paragraph->style().computedLineHeight();
</span><span class="cx">
</span><span class="cx"> // Set the font to be one line too big and then ratchet back to get to a precise fit. We can't just set the desired font size based off font height metrics
</span><span class="cx"> // because many fonts bake ascent into the font metrics. Therefore we have to look at actual measured cap height values in order to know when we have a good fit.
</span><del>- auto newFontDescription = pseudoStyle->fontDescription();
- float capRatio = pseudoStyle->fontMetrics().floatCapHeight() / pseudoStyle->fontSize();
- float startingFontSize = ((pseudoStyle->initialLetterHeight() - 1) * lineHeight + paragraph->style().fontMetrics().capHeight()) / capRatio;
</del><ins>+ auto newFontDescription = firstLetterStyle.fontDescription();
+ float capRatio = firstLetterStyle.fontMetrics().floatCapHeight() / firstLetterStyle.fontSize();
+ float startingFontSize = ((firstLetterStyle.initialLetterHeight() - 1) * lineHeight + paragraph->style().fontMetrics().capHeight()) / capRatio;
</ins><span class="cx"> newFontDescription.setSpecifiedSize(startingFontSize);
</span><span class="cx"> newFontDescription.setComputedSize(startingFontSize);
</span><del>- pseudoStyle->setFontDescription(newFontDescription);
- pseudoStyle->fontCascade().update(pseudoStyle->fontCascade().fontSelector());
</del><ins>+ firstLetterStyle.setFontDescription(newFontDescription);
+ firstLetterStyle.fontCascade().update(firstLetterStyle.fontCascade().fontSelector());
</ins><span class="cx">
</span><del>- int desiredCapHeight = (pseudoStyle->initialLetterHeight() - 1) * lineHeight + paragraph->style().fontMetrics().capHeight();
- int actualCapHeight = pseudoStyle->fontMetrics().capHeight();
</del><ins>+ int desiredCapHeight = (firstLetterStyle.initialLetterHeight() - 1) * lineHeight + paragraph->style().fontMetrics().capHeight();
+ int actualCapHeight = firstLetterStyle.fontMetrics().capHeight();
</ins><span class="cx"> while (actualCapHeight > desiredCapHeight) {
</span><del>- auto newFontDescription = pseudoStyle->fontDescription();
</del><ins>+ auto newFontDescription = firstLetterStyle.fontDescription();
</ins><span class="cx"> newFontDescription.setSpecifiedSize(newFontDescription.specifiedSize() - 1);
</span><span class="cx"> newFontDescription.setComputedSize(newFontDescription.computedSize() -1);
</span><del>- pseudoStyle->setFontDescription(newFontDescription);
- pseudoStyle->fontCascade().update(pseudoStyle->fontCascade().fontSelector());
- actualCapHeight = pseudoStyle->fontMetrics().capHeight();
</del><ins>+ firstLetterStyle.setFontDescription(newFontDescription);
+ firstLetterStyle.fontCascade().update(firstLetterStyle.fontCascade().fontSelector());
+ actualCapHeight = firstLetterStyle.fontMetrics().capHeight();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Force inline display (except for floating first-letters).
</span><del>- pseudoStyle->setDisplay(pseudoStyle->isFloating() ? BLOCK : INLINE);
</del><ins>+ firstLetterStyle.setDisplay(firstLetterStyle.isFloating() ? BLOCK : INLINE);
</ins><span class="cx"> // CSS2 says first-letter can't be positioned.
</span><del>- pseudoStyle->setPosition(StaticPosition);
- return *pseudoStyle;
</del><ins>+ firstLetterStyle.setPosition(StaticPosition);
+ return firstLetterStyle;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // CSS 2.1 http://www.w3.org/TR/CSS21/selector.html#first-letter
</span><span class="lines">@@ -3135,7 +3135,7 @@
</span><span class="cx"> {
</span><span class="cx"> RenderElement* firstLetter = currentChild->parent();
</span><span class="cx"> RenderElement* firstLetterContainer = firstLetter->parent();
</span><del>- auto& pseudoStyle = styleForFirstLetter(firstLetterBlock, firstLetterContainer);
</del><ins>+ auto pseudoStyle = styleForFirstLetter(*firstLetterBlock, *firstLetterContainer);
</ins><span class="cx"> ASSERT(firstLetter->isFloating() || firstLetter->isInline());
</span><span class="cx">
</span><span class="cx"> if (Style::determineChange(firstLetter->style(), pseudoStyle) == Style::Detach) {
</span><span class="lines">@@ -3142,9 +3142,9 @@
</span><span class="cx"> // The first-letter renderer needs to be replaced. Create a new renderer of the right type.
</span><span class="cx"> RenderBoxModelObject* newFirstLetter;
</span><span class="cx"> if (pseudoStyle.display() == INLINE)
</span><del>- newFirstLetter = new RenderInline(document(), RenderStyle::clone(pseudoStyle));
</del><ins>+ newFirstLetter = new RenderInline(document(), WTFMove(pseudoStyle));
</ins><span class="cx"> else
</span><del>- newFirstLetter = new RenderBlockFlow(document(), RenderStyle::clone(pseudoStyle));
</del><ins>+ newFirstLetter = new RenderBlockFlow(document(), WTFMove(pseudoStyle));
</ins><span class="cx"> newFirstLetter->initializeStyle();
</span><span class="cx">
</span><span class="cx"> // Move the first letter into the new renderer.
</span><span class="lines">@@ -3170,18 +3170,18 @@
</span><span class="cx"> firstLetter = newFirstLetter;
</span><span class="cx"> firstLetterContainer->addChild(firstLetter, nextSibling);
</span><span class="cx"> } else
</span><del>- firstLetter->setStyle(RenderStyle::clone(pseudoStyle));
</del><ins>+ firstLetter->setStyle(WTFMove(pseudoStyle));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBlock::createFirstLetterRenderer(RenderElement* firstLetterBlock, RenderText* currentTextChild)
</span><span class="cx"> {
</span><span class="cx"> RenderElement* firstLetterContainer = currentTextChild->parent();
</span><del>- auto& pseudoStyle = styleForFirstLetter(firstLetterBlock, firstLetterContainer);
</del><ins>+ auto pseudoStyle = styleForFirstLetter(*firstLetterBlock, *firstLetterContainer);
</ins><span class="cx"> RenderBoxModelObject* firstLetter = nullptr;
</span><span class="cx"> if (pseudoStyle.display() == INLINE)
</span><del>- firstLetter = new RenderInline(document(), RenderStyle::clone(pseudoStyle));
</del><ins>+ firstLetter = new RenderInline(document(), WTFMove(pseudoStyle));
</ins><span class="cx"> else
</span><del>- firstLetter = new RenderBlockFlow(document(), RenderStyle::clone(pseudoStyle));
</del><ins>+ firstLetter = new RenderBlockFlow(document(), WTFMove(pseudoStyle));
</ins><span class="cx"> firstLetter->initializeStyle();
</span><span class="cx"> firstLetterContainer->addChild(firstLetter, currentTextChild);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (208796 => 208797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-11-16 18:07:25 UTC (rev 208796)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-11-16 18:08:30 UTC (rev 208797)
</span><span class="lines">@@ -1530,21 +1530,6 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderStyle* RenderElement::getMutableCachedPseudoStyle(PseudoId pseudo, const RenderStyle* parentStyle)
-{
- if (pseudo < FIRST_INTERNAL_PSEUDOID && !style().hasPseudoStyle(pseudo))
- return nullptr;
-
- RenderStyle* cachedStyle = style().getCachedPseudoStyle(pseudo);
- if (cachedStyle)
- return cachedStyle;
-
- std::unique_ptr<RenderStyle> result = getUncachedPseudoStyle(PseudoStyleRequest(pseudo), parentStyle);
- if (result)
- return m_style.addCachedPseudoStyle(WTFMove(result));
- return nullptr;
-}
-
</del><span class="cx"> std::unique_ptr<RenderStyle> RenderElement::getUncachedPseudoStyle(const PseudoStyleRequest& pseudoStyleRequest, const RenderStyle* parentStyle, const RenderStyle* ownStyle) const
</span><span class="cx"> {
</span><span class="cx"> if (pseudoStyleRequest.pseudoId < FIRST_INTERNAL_PSEUDOID && !ownStyle && !style().hasPseudoStyle(pseudoStyleRequest.pseudoId))
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (208796 => 208797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2016-11-16 18:07:25 UTC (rev 208796)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2016-11-16 18:08:30 UTC (rev 208797)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> // The pseudo element style can be cached or uncached. Use the cached method if the pseudo element doesn't respect
</span><span class="cx"> // any pseudo classes (and therefore has no concept of changing state).
</span><span class="cx"> const RenderStyle* getCachedPseudoStyle(PseudoId, const RenderStyle* parentStyle = nullptr) const;
</span><del>- RenderStyle* getMutableCachedPseudoStyle(PseudoId, const RenderStyle* parentStyle = nullptr);
</del><span class="cx"> std::unique_ptr<RenderStyle> getUncachedPseudoStyle(const PseudoStyleRequest&, const RenderStyle* parentStyle = nullptr, const RenderStyle* ownStyle = nullptr) const;
</span><span class="cx">
</span><span class="cx"> // This is null for anonymous renderers.
</span></span></pre>
</div>
</div>
</body>
</html>