Title: [164489] trunk/Source/WebCore
- Revision
- 164489
- Author
- ddkil...@apple.com
- Date
- 2014-02-21 11:38:31 -0800 (Fri, 21 Feb 2014)
Log Message
StyleResolver::loadPendingImage() should take a reference to StylePendingImage
<http://webkit.org/b/129021>
Reviewed by Brent Fulgham.
* css/StyleResolver.cpp:
(WebCore::StyleResolver::loadPendingImage): Change pendingImage
parameter to a reference.
(WebCore::StyleResolver::loadPendingShapeImage): Update to use
references.
(WebCore::StyleResolver::loadPendingImages): Ditto.
* css/StyleResolver.h:
(WebCore::StyleResolver::loadPendingImage): Change pendingImage
parameter to a reference.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (164488 => 164489)
--- trunk/Source/WebCore/ChangeLog 2014-02-21 19:28:15 UTC (rev 164488)
+++ trunk/Source/WebCore/ChangeLog 2014-02-21 19:38:31 UTC (rev 164489)
@@ -1,3 +1,20 @@
+2014-02-21 David Kilzer <ddkil...@apple.com>
+
+ StyleResolver::loadPendingImage() should take a reference to StylePendingImage
+ <http://webkit.org/b/129021>
+
+ Reviewed by Brent Fulgham.
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::loadPendingImage): Change pendingImage
+ parameter to a reference.
+ (WebCore::StyleResolver::loadPendingShapeImage): Update to use
+ references.
+ (WebCore::StyleResolver::loadPendingImages): Ditto.
+ * css/StyleResolver.h:
+ (WebCore::StyleResolver::loadPendingImage): Change pendingImage
+ parameter to a reference.
+
2014-02-21 Joseph Pecoraro <pecor...@apple.com>
Web Inspector: JSContext inspection should report exceptions in the console
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (164488 => 164489)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-21 19:28:15 UTC (rev 164488)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-21 19:38:31 UTC (rev 164489)
@@ -3482,28 +3482,28 @@
#endif
-PassRefPtr<StyleImage> StyleResolver::loadPendingImage(StylePendingImage* pendingImage, const ResourceLoaderOptions& options)
+PassRefPtr<StyleImage> StyleResolver::loadPendingImage(const StylePendingImage& pendingImage, const ResourceLoaderOptions& options)
{
- if (auto imageValue = pendingImage->cssImageValue())
+ if (auto imageValue = pendingImage.cssImageValue())
return imageValue->cachedImage(m_state.document().cachedResourceLoader(), options);
- if (auto imageGeneratorValue = pendingImage->cssImageGeneratorValue()) {
+ if (auto imageGeneratorValue = pendingImage.cssImageGeneratorValue()) {
imageGeneratorValue->loadSubimages(m_state.document().cachedResourceLoader());
return StyleGeneratedImage::create(*imageGeneratorValue);
}
- if (auto cursorImageValue = pendingImage->cssCursorImageValue())
+ if (auto cursorImageValue = pendingImage.cssCursorImageValue())
return cursorImageValue->cachedImage(m_state.document().cachedResourceLoader());
#if ENABLE(CSS_IMAGE_SET)
- if (CSSImageSetValue* imageSetValue = pendingImage->cssImageSetValue())
+ if (auto imageSetValue = pendingImage.cssImageSetValue())
return imageSetValue->cachedImageSet(m_state.document().cachedResourceLoader(), options);
#endif
return nullptr;
}
-PassRefPtr<StyleImage> StyleResolver::loadPendingImage(StylePendingImage* pendingImage)
+PassRefPtr<StyleImage> StyleResolver::loadPendingImage(const StylePendingImage& pendingImage)
{
return loadPendingImage(pendingImage, CachedResourceLoader::defaultCachedResourceOptions());
}
@@ -3518,7 +3518,7 @@
if (!image || !image->isPendingImage())
return;
- StylePendingImage* pendingImage = toStylePendingImage(image);
+ auto& pendingImage = toStylePendingImage(*image);
ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
options.requestOriginPolicy = PotentiallyCrossOriginEnabled;
@@ -3540,8 +3540,9 @@
switch (currentProperty) {
case CSSPropertyBackgroundImage: {
for (FillLayer* backgroundLayer = m_state.style()->accessBackgroundLayers(); backgroundLayer; backgroundLayer = backgroundLayer->next()) {
- if (backgroundLayer->image() && backgroundLayer->image()->isPendingImage())
- backgroundLayer->setImage(loadPendingImage(toStylePendingImage(backgroundLayer->image())));
+ auto styleImage = backgroundLayer->image();
+ if (styleImage && styleImage->isPendingImage())
+ backgroundLayer->setImage(loadPendingImage(toStylePendingImage(*styleImage)));
}
break;
}
@@ -3550,7 +3551,7 @@
if (contentData->isImage()) {
auto& styleImage = toImageContentData(contentData)->image();
if (styleImage.isPendingImage()) {
- RefPtr<StyleImage> loadedImage = loadPendingImage(toStylePendingImage(const_cast<StyleImage*>(&styleImage)));
+ RefPtr<StyleImage> loadedImage = loadPendingImage(toStylePendingImage(styleImage));
if (loadedImage)
toImageContentData(contentData)->setImage(loadedImage.release());
}
@@ -3562,43 +3563,47 @@
if (CursorList* cursorList = m_state.style()->cursors()) {
for (size_t i = 0; i < cursorList->size(); ++i) {
CursorData& currentCursor = cursorList->at(i);
- if (StyleImage* image = currentCursor.image()) {
- if (image->isPendingImage())
- currentCursor.setImage(loadPendingImage(toStylePendingImage(image)));
- }
+ auto styleImage = currentCursor.image();
+ if (styleImage && styleImage->isPendingImage())
+ currentCursor.setImage(loadPendingImage(toStylePendingImage(*styleImage)));
}
}
break;
}
case CSSPropertyListStyleImage: {
- if (m_state.style()->listStyleImage() && m_state.style()->listStyleImage()->isPendingImage())
- m_state.style()->setListStyleImage(loadPendingImage(toStylePendingImage(m_state.style()->listStyleImage())));
+ auto styleImage = m_state.style()->listStyleImage();
+ if (styleImage && styleImage->isPendingImage())
+ m_state.style()->setListStyleImage(loadPendingImage(toStylePendingImage(*styleImage)));
break;
}
case CSSPropertyBorderImageSource: {
- if (m_state.style()->borderImageSource() && m_state.style()->borderImageSource()->isPendingImage())
- m_state.style()->setBorderImageSource(loadPendingImage(toStylePendingImage(m_state.style()->borderImageSource())));
+ auto styleImage = m_state.style()->borderImageSource();
+ if (styleImage && styleImage->isPendingImage())
+ m_state.style()->setBorderImageSource(loadPendingImage(toStylePendingImage(*styleImage)));
break;
}
case CSSPropertyWebkitBoxReflect: {
if (StyleReflection* reflection = m_state.style()->boxReflect()) {
const NinePieceImage& maskImage = reflection->mask();
- if (maskImage.image() && maskImage.image()->isPendingImage()) {
- RefPtr<StyleImage> loadedImage = loadPendingImage(toStylePendingImage(maskImage.image()));
+ auto styleImage = maskImage.image();
+ if (styleImage && styleImage->isPendingImage()) {
+ RefPtr<StyleImage> loadedImage = loadPendingImage(toStylePendingImage(*styleImage));
reflection->setMask(NinePieceImage(loadedImage.release(), maskImage.imageSlices(), maskImage.fill(), maskImage.borderSlices(), maskImage.outset(), maskImage.horizontalRule(), maskImage.verticalRule()));
}
}
break;
}
case CSSPropertyWebkitMaskBoxImageSource: {
- if (m_state.style()->maskBoxImageSource() && m_state.style()->maskBoxImageSource()->isPendingImage())
- m_state.style()->setMaskBoxImageSource(loadPendingImage(toStylePendingImage(m_state.style()->maskBoxImageSource())));
+ auto styleImage = m_state.style()->maskBoxImageSource();
+ if (styleImage && styleImage->isPendingImage())
+ m_state.style()->setMaskBoxImageSource(loadPendingImage(toStylePendingImage(*styleImage)));
break;
}
case CSSPropertyWebkitMaskImage: {
for (FillLayer* maskLayer = m_state.style()->accessMaskLayers(); maskLayer; maskLayer = maskLayer->next()) {
- if (maskLayer->image() && maskLayer->image()->isPendingImage())
- maskLayer->setImage(loadPendingImage(toStylePendingImage(maskLayer->image())));
+ auto styleImage = maskLayer->image();
+ if (styleImage && styleImage->isPendingImage())
+ maskLayer->setImage(loadPendingImage(toStylePendingImage(*styleImage)));
}
break;
}
Modified: trunk/Source/WebCore/css/StyleResolver.h (164488 => 164489)
--- trunk/Source/WebCore/css/StyleResolver.h 2014-02-21 19:28:15 UTC (rev 164488)
+++ trunk/Source/WebCore/css/StyleResolver.h 2014-02-21 19:38:31 UTC (rev 164489)
@@ -472,8 +472,8 @@
void applySVGProperty(CSSPropertyID, CSSValue*);
- PassRefPtr<StyleImage> loadPendingImage(StylePendingImage*, const ResourceLoaderOptions&);
- PassRefPtr<StyleImage> loadPendingImage(StylePendingImage*);
+ PassRefPtr<StyleImage> loadPendingImage(const StylePendingImage&, const ResourceLoaderOptions&);
+ PassRefPtr<StyleImage> loadPendingImage(const StylePendingImage&);
void loadPendingImages();
#if ENABLE(CSS_SHAPES)
void loadPendingShapeImage(ShapeValue*);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
