Title: [164224] trunk/Source/WebCore
- Revision
- 164224
- Author
- [email protected]
- Date
- 2014-02-17 09:18:29 -0800 (Mon, 17 Feb 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (164223 => 164224)
--- 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)
@@ -1,3 +1,38 @@
+2014-02-17 David Kilzer <[email protected]>
+
+ 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.
+
2014-02-17 Jer Noble <[email protected]>
[MediaControls][iOS] Make mediacontrols match the system inline controls
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (164223 => 164224)
--- 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)
@@ -1407,15 +1407,11 @@
{
auto list = CSSValueList::createSpaceSeparated();
for (const ContentData* contentData = style->contentData(); contentData; contentData = contentData->next()) {
- 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())
+ 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())
list.get().append(cssValuePool().createValue(toTextContentData(contentData)->text(), CSSPrimitiveValue::CSS_STRING));
}
if (style->hasFlowFrom())
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (164223 => 164224)
--- 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)
@@ -3544,9 +3544,9 @@
case CSSPropertyContent: {
for (ContentData* contentData = const_cast<ContentData*>(m_state.style()->contentData()); contentData; contentData = contentData->next()) {
if (contentData->isImage()) {
- StyleImage* image = toImageContentData(contentData)->image();
- if (image->isPendingImage()) {
- RefPtr<StyleImage> loadedImage = loadPendingImage(static_cast<StylePendingImage*>(image));
+ auto& styleImage = toImageContentData(contentData)->image();
+ if (styleImage.isPendingImage()) {
+ RefPtr<StyleImage> loadedImage = loadPendingImage(static_cast<StylePendingImage*>(const_cast<StyleImage*>(&styleImage)));
if (loadedImage)
toImageContentData(contentData)->setImage(loadedImage.release());
}
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (164223 => 164224)
--- 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)
@@ -133,10 +133,9 @@
// Otherwise acts as if we didn't support this feature.
const ContentData* contentData = style.get().contentData();
if (contentData && !contentData->next() && contentData->isImage() && !element.isPseudoElement()) {
- auto styleImage = const_cast<StyleImage*>(toImageContentData(contentData)->image());
- auto image = createRenderer<RenderImage>(element, std::move(style), styleImage);
- if (styleImage)
- image->setIsGeneratedContent();
+ auto& styleImage = toImageContentData(contentData)->image();
+ auto image = createRenderer<RenderImage>(element, std::move(style), const_cast<StyleImage*>(&styleImage));
+ image->setIsGeneratedContent();
return std::move(image);
}
Modified: trunk/Source/WebCore/rendering/style/ContentData.h (164223 => 164224)
--- 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)
@@ -87,20 +87,22 @@
: ContentData(ImageDataType)
, m_image(image)
{
+ ASSERT(m_image);
}
- const StyleImage* image() const { return m_image.get(); }
- StyleImage* image() { return m_image.get(); }
- void setImage(PassRefPtr<StyleImage> image) { m_image = image; }
+ const StyleImage& image() const { return *m_image; }
+ void setImage(PassRefPtr<StyleImage> image)
+ {
+ ASSERT(image);
+ m_image = image;
+ }
virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const override;
private:
virtual std::unique_ptr<ContentData> cloneInternal() const override
{
- RefPtr<StyleImage> image = const_cast<StyleImage*>(this->image());
-
- return std::make_unique<ImageContentData>(image.release());
+ return std::make_unique<ImageContentData>(m_image.get());
}
RefPtr<StyleImage> m_image;
@@ -110,7 +112,7 @@
inline bool operator==(const ImageContentData& a, const ImageContentData& b)
{
- return *a.image() == *b.image();
+ return a.image() == b.image();
}
inline bool operator!=(const ImageContentData& a, const ImageContentData& b)
@@ -155,17 +157,22 @@
: ContentData(CounterDataType)
, m_counter(std::move(counter))
{
+ ASSERT(m_counter);
}
- const CounterContent* counter() const { return m_counter.get(); }
- void setCounter(std::unique_ptr<CounterContent> counter) { m_counter = std::move(counter); }
+ const CounterContent& counter() const { return *m_counter; }
+ void setCounter(std::unique_ptr<CounterContent> counter)
+ {
+ ASSERT(counter);
+ m_counter = std::move(counter);
+ }
virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const override;
private:
virtual std::unique_ptr<ContentData> cloneInternal() const override
{
- auto counterData = std::make_unique<CounterContent>(*counter());
+ auto counterData = std::make_unique<CounterContent>(counter());
return std::make_unique<CounterContentData>(std::move(counterData));
}
@@ -176,7 +183,7 @@
inline bool operator==(const CounterContentData& a, const CounterContentData& b)
{
- return *a.counter() == *b.counter();
+ return a.counter() == b.counter();
}
inline bool operator!=(const CounterContentData& a, const CounterContentData& b)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
