<!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>[164224] 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/164224">164224</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2014-02-17 09:18:29 -0800 (Mon, 17 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>CounterContentData::counter() and ImageContentData::image() should return references
<http://webkit.org/b/128671>
Reviewed by Darin Adler.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::contentToCSSValue):
- Update to use references. Remove useless ASSERTs.
* css/StyleResolver.cpp:
(WebCore::StyleResolver::loadPendingImages):
- Update to use references. StyleResolver::loadPendingImage()
will be changed to take a reference in the near future.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::createFor):
- Update to use references. The auto keyword wanted to
instantiate a StyleImage instead a reference, so it was
replaced.
* rendering/style/ContentData.h:
(WebCore::ImageContentData::ImageContentData): Add ASSERT that
m_image is not NULL.
(WebCore::ImageContentData::image): Return a reference. Remove
useless overload with identical name.
(WebCore::ImageContentData::cloneInternal): Simplify by using
implicit PassRefPtr constructor.
(WebCore::operator==): Remove unneeded deref operators.
(WebCore::CounterContentData::counter): Return a reference.
(WebCore::CounterContentData::cloneInternal): Remove unneeded
deref operator.
(WebCore::operator==): Remove unneeded deref operators.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</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="#trunkSourceWebCorerenderingstyleContentDatah">trunk/Source/WebCore/rendering/style/ContentData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164223 => 164224)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-17 17:17:23 UTC (rev 164223)
+++ trunk/Source/WebCore/ChangeLog 2014-02-17 17:18:29 UTC (rev 164224)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-02-17 David Kilzer <ddkilzer@apple.com>
+
+ CounterContentData::counter() and ImageContentData::image() should return references
+ <http://webkit.org/b/128671>
+
+ Reviewed by Darin Adler.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::contentToCSSValue):
+ - Update to use references. Remove useless ASSERTs.
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::loadPendingImages):
+ - Update to use references. StyleResolver::loadPendingImage()
+ will be changed to take a reference in the near future.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::createFor):
+ - Update to use references. The auto keyword wanted to
+ instantiate a StyleImage instead a reference, so it was
+ replaced.
+
+ * rendering/style/ContentData.h:
+ (WebCore::ImageContentData::ImageContentData): Add ASSERT that
+ m_image is not NULL.
+ (WebCore::ImageContentData::image): Return a reference. Remove
+ useless overload with identical name.
+ (WebCore::ImageContentData::cloneInternal): Simplify by using
+ implicit PassRefPtr constructor.
+ (WebCore::operator==): Remove unneeded deref operators.
+ (WebCore::CounterContentData::counter): Return a reference.
+ (WebCore::CounterContentData::cloneInternal): Remove unneeded
+ deref operator.
+ (WebCore::operator==): Remove unneeded deref operators.
+
</ins><span class="cx"> 2014-02-17 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaControls][iOS] Make mediacontrols match the system inline controls
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (164223 => 164224)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-02-17 17:17:23 UTC (rev 164223)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-02-17 17:18:29 UTC (rev 164224)
</span><span class="lines">@@ -1407,15 +1407,11 @@
</span><span class="cx"> {
</span><span class="cx"> auto list = CSSValueList::createSpaceSeparated();
</span><span class="cx"> for (const ContentData* contentData = style->contentData(); contentData; contentData = contentData->next()) {
</span><del>- if (contentData->isCounter()) {
- const CounterContent* counter = toCounterContentData(contentData)->counter();
- ASSERT(counter);
- list.get().append(cssValuePool().createValue(counter->identifier(), CSSPrimitiveValue::CSS_COUNTER_NAME));
- } else if (contentData->isImage()) {
- const StyleImage* image = toImageContentData(contentData)->image();
- ASSERT(image);
- list.get().append(image->cssValue());
- } else if (contentData->isText())
</del><ins>+ if (contentData->isCounter())
+ list.get().append(cssValuePool().createValue(toCounterContentData(contentData)->counter().identifier(), CSSPrimitiveValue::CSS_COUNTER_NAME));
+ else if (contentData->isImage())
+ list.get().append(toImageContentData(contentData)->image().cssValue());
+ else if (contentData->isText())
</ins><span class="cx"> list.get().append(cssValuePool().createValue(toTextContentData(contentData)->text(), CSSPrimitiveValue::CSS_STRING));
</span><span class="cx"> }
</span><span class="cx"> if (style->hasFlowFrom())
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (164223 => 164224)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-17 17:17:23 UTC (rev 164223)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-17 17:18:29 UTC (rev 164224)
</span><span class="lines">@@ -3544,9 +3544,9 @@
</span><span class="cx"> case CSSPropertyContent: {
</span><span class="cx"> for (ContentData* contentData = const_cast<ContentData*>(m_state.style()->contentData()); contentData; contentData = contentData->next()) {
</span><span class="cx"> if (contentData->isImage()) {
</span><del>- StyleImage* image = toImageContentData(contentData)->image();
- if (image->isPendingImage()) {
- RefPtr<StyleImage> loadedImage = loadPendingImage(static_cast<StylePendingImage*>(image));
</del><ins>+ auto& styleImage = toImageContentData(contentData)->image();
+ if (styleImage.isPendingImage()) {
+ RefPtr<StyleImage> loadedImage = loadPendingImage(static_cast<StylePendingImage*>(const_cast<StyleImage*>(&styleImage)));
</ins><span class="cx"> if (loadedImage)
</span><span class="cx"> toImageContentData(contentData)->setImage(loadedImage.release());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (164223 => 164224)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-02-17 17:17:23 UTC (rev 164223)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-02-17 17:18:29 UTC (rev 164224)
</span><span class="lines">@@ -133,10 +133,9 @@
</span><span class="cx"> // Otherwise acts as if we didn't support this feature.
</span><span class="cx"> const ContentData* contentData = style.get().contentData();
</span><span class="cx"> if (contentData && !contentData->next() && contentData->isImage() && !element.isPseudoElement()) {
</span><del>- auto styleImage = const_cast<StyleImage*>(toImageContentData(contentData)->image());
- auto image = createRenderer<RenderImage>(element, std::move(style), styleImage);
- if (styleImage)
- image->setIsGeneratedContent();
</del><ins>+ auto& styleImage = toImageContentData(contentData)->image();
+ auto image = createRenderer<RenderImage>(element, std::move(style), const_cast<StyleImage*>(&styleImage));
+ image->setIsGeneratedContent();
</ins><span class="cx"> return std::move(image);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleContentDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/ContentData.h (164223 => 164224)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/ContentData.h 2014-02-17 17:17:23 UTC (rev 164223)
+++ trunk/Source/WebCore/rendering/style/ContentData.h 2014-02-17 17:18:29 UTC (rev 164224)
</span><span class="lines">@@ -87,20 +87,22 @@
</span><span class="cx"> : ContentData(ImageDataType)
</span><span class="cx"> , m_image(image)
</span><span class="cx"> {
</span><ins>+ ASSERT(m_image);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- const StyleImage* image() const { return m_image.get(); }
- StyleImage* image() { return m_image.get(); }
- void setImage(PassRefPtr<StyleImage> image) { m_image = image; }
</del><ins>+ const StyleImage& image() const { return *m_image; }
+ void setImage(PassRefPtr<StyleImage> image)
+ {
+ ASSERT(image);
+ m_image = image;
+ }
</ins><span class="cx">
</span><span class="cx"> virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const override;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual std::unique_ptr<ContentData> cloneInternal() const override
</span><span class="cx"> {
</span><del>- RefPtr<StyleImage> image = const_cast<StyleImage*>(this->image());
-
- return std::make_unique<ImageContentData>(image.release());
</del><ins>+ return std::make_unique<ImageContentData>(m_image.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<StyleImage> m_image;
</span><span class="lines">@@ -110,7 +112,7 @@
</span><span class="cx">
</span><span class="cx"> inline bool operator==(const ImageContentData& a, const ImageContentData& b)
</span><span class="cx"> {
</span><del>- return *a.image() == *b.image();
</del><ins>+ return a.image() == b.image();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool operator!=(const ImageContentData& a, const ImageContentData& b)
</span><span class="lines">@@ -155,17 +157,22 @@
</span><span class="cx"> : ContentData(CounterDataType)
</span><span class="cx"> , m_counter(std::move(counter))
</span><span class="cx"> {
</span><ins>+ ASSERT(m_counter);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- const CounterContent* counter() const { return m_counter.get(); }
- void setCounter(std::unique_ptr<CounterContent> counter) { m_counter = std::move(counter); }
</del><ins>+ const CounterContent& counter() const { return *m_counter; }
+ void setCounter(std::unique_ptr<CounterContent> counter)
+ {
+ ASSERT(counter);
+ m_counter = std::move(counter);
+ }
</ins><span class="cx">
</span><span class="cx"> virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const override;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual std::unique_ptr<ContentData> cloneInternal() const override
</span><span class="cx"> {
</span><del>- auto counterData = std::make_unique<CounterContent>(*counter());
</del><ins>+ auto counterData = std::make_unique<CounterContent>(counter());
</ins><span class="cx"> return std::make_unique<CounterContentData>(std::move(counterData));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -176,7 +183,7 @@
</span><span class="cx">
</span><span class="cx"> inline bool operator==(const CounterContentData& a, const CounterContentData& b)
</span><span class="cx"> {
</span><del>- return *a.counter() == *b.counter();
</del><ins>+ return a.counter() == b.counter();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool operator!=(const CounterContentData& a, const CounterContentData& b)
</span></span></pre>
</div>
</div>
</body>
</html>