<!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>[178157] 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/178157">178157</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2015-01-08 21:29:55 -0800 (Thu, 08 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove strange CharacterData::dataImpl function
https://bugs.webkit.org/show_bug.cgi?id=140115
Reviewed by Anders Carlsson.
Every call site could just use the data function instead.
* dom/CharacterData.h:
(WebCore::CharacterData::dataImpl): Deleted.
* dom/Text.cpp:
(WebCore::Text::splitText): Use data instead of dataImpl.
(WebCore::Text::createTextRenderer): Ditto.
* rendering/RenderCombineText.cpp:
(WebCore::RenderCombineText::RenderCombineText): Updated to take
const String&. We missed this class when RenderText changed.
* rendering/RenderCombineText.h: Ditto.
* style/StyleResolveTree.cpp:
(WebCore::Style::updateTextRendererAfterContentChange): Use data.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomCharacterDatah">trunk/Source/WebCore/dom/CharacterData.h</a></li>
<li><a href="#trunkSourceWebCoredomTextcpp">trunk/Source/WebCore/dom/Text.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderCombineTextcpp">trunk/Source/WebCore/rendering/RenderCombineText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderCombineTexth">trunk/Source/WebCore/rendering/RenderCombineText.h</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 (178156 => 178157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-09 05:29:09 UTC (rev 178156)
+++ trunk/Source/WebCore/ChangeLog 2015-01-09 05:29:55 UTC (rev 178157)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-01-08 Darin Adler <darin@apple.com>
+
+ Remove strange CharacterData::dataImpl function
+ https://bugs.webkit.org/show_bug.cgi?id=140115
+
+ Reviewed by Anders Carlsson.
+
+ Every call site could just use the data function instead.
+
+ * dom/CharacterData.h:
+ (WebCore::CharacterData::dataImpl): Deleted.
+
+ * dom/Text.cpp:
+ (WebCore::Text::splitText): Use data instead of dataImpl.
+ (WebCore::Text::createTextRenderer): Ditto.
+
+ * rendering/RenderCombineText.cpp:
+ (WebCore::RenderCombineText::RenderCombineText): Updated to take
+ const String&. We missed this class when RenderText changed.
+ * rendering/RenderCombineText.h: Ditto.
+
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::updateTextRendererAfterContentChange): Use data.
+
</ins><span class="cx"> 2015-01-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: !valueWithCalculation.calculation() in WebCore::CSSParser::validateCalculationUnit
</span></span></pre></div>
<a id="trunkSourceWebCoredomCharacterDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CharacterData.h (178156 => 178157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CharacterData.h 2015-01-09 05:29:09 UTC (rev 178156)
+++ trunk/Source/WebCore/dom/CharacterData.h 2015-01-09 05:29:55 UTC (rev 178157)
</span><span class="lines">@@ -43,8 +43,6 @@
</span><span class="cx">
</span><span class="cx"> bool containsOnlyWhitespace() const;
</span><span class="cx">
</span><del>- StringImpl* dataImpl() { return m_data.impl(); }
-
</del><span class="cx"> // Like appendData, but optimized for the parser (e.g., no mutation events).
</span><span class="cx"> // Returns how much could be added before length limit was met.
</span><span class="cx"> unsigned parserAppendData(const String& string, unsigned offset, unsigned lengthLimit);
</span></span></pre></div>
<a id="trunkSourceWebCoredomTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Text.cpp (178156 => 178157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Text.cpp 2015-01-09 05:29:09 UTC (rev 178156)
+++ trunk/Source/WebCore/dom/Text.cpp 2015-01-09 05:29:55 UTC (rev 178157)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> document().textNodeSplit(this);
</span><span class="cx">
</span><span class="cx"> if (renderer())
</span><del>- renderer()->setTextWithOffset(dataImpl(), 0, oldStr.length());
</del><ins>+ renderer()->setTextWithOffset(data(), 0, oldStr.length());
</ins><span class="cx">
</span><span class="cx"> return WTF::move(newText);
</span><span class="cx"> }
</span><span class="lines">@@ -185,12 +185,12 @@
</span><span class="cx"> RenderPtr<RenderText> Text::createTextRenderer(const RenderStyle& style)
</span><span class="cx"> {
</span><span class="cx"> if (isSVGText(this) || isSVGShadowText(this))
</span><del>- return createRenderer<RenderSVGInlineText>(*this, dataImpl());
</del><ins>+ return createRenderer<RenderSVGInlineText>(*this, data());
</ins><span class="cx">
</span><span class="cx"> if (style.hasTextCombine())
</span><del>- return createRenderer<RenderCombineText>(*this, dataImpl());
</del><ins>+ return createRenderer<RenderCombineText>(*this, data());
</ins><span class="cx">
</span><del>- return createRenderer<RenderText>(*this, dataImpl());
</del><ins>+ return createRenderer<RenderText>(*this, data());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Text::childTypeAllowed(NodeType) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderCombineTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderCombineText.cpp (178156 => 178157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderCombineText.cpp 2015-01-09 05:29:09 UTC (rev 178156)
+++ trunk/Source/WebCore/rendering/RenderCombineText.cpp 2015-01-09 05:29:55 UTC (rev 178157)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> const float textCombineMargin = 1.15f; // Allow em + 15% margin
</span><span class="cx">
</span><del>-RenderCombineText::RenderCombineText(Text& textNode, PassRefPtr<StringImpl> string)
</del><ins>+RenderCombineText::RenderCombineText(Text& textNode, const String& string)
</ins><span class="cx"> : RenderText(textNode, string)
</span><span class="cx"> , m_isCombined(false)
</span><span class="cx"> , m_needsFontUpdate(false)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderCombineTexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderCombineText.h (178156 => 178157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderCombineText.h 2015-01-09 05:29:09 UTC (rev 178156)
+++ trunk/Source/WebCore/rendering/RenderCombineText.h 2015-01-09 05:29:55 UTC (rev 178157)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> class RenderCombineText final : public RenderText {
</span><span class="cx"> public:
</span><del>- RenderCombineText(Text&, PassRefPtr<StringImpl>);
</del><ins>+ RenderCombineText(Text&, const String&);
</ins><span class="cx">
</span><span class="cx"> Text& textNode() const { return downcast<Text>(nodeForNonAnonymous()); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (178156 => 178157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-01-09 05:29:09 UTC (rev 178156)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-01-09 05:29:55 UTC (rev 178157)
</span><span class="lines">@@ -465,7 +465,7 @@
</span><span class="cx"> resolveTextNode(textNode, renderTreePosition);
</span><span class="cx">
</span><span class="cx"> if (hadRenderer && textNode.renderer())
</span><del>- textNode.renderer()->setTextWithOffset(textNode.dataImpl(), offsetOfReplacedData, lengthOfReplacedData);
</del><ins>+ textNode.renderer()->setTextWithOffset(textNode.data(), offsetOfReplacedData, lengthOfReplacedData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void attachChildren(ContainerNode& current, RenderStyle& inheritedStyle, RenderTreePosition& renderTreePosition)
</span></span></pre>
</div>
</div>
</body>
</html>