Title: [160478] trunk/Source/WebCore
- Revision
- 160478
- Author
- [email protected]
- Date
- 2013-12-12 00:44:32 -0800 (Thu, 12 Dec 2013)
Log Message
Remove some unneeded code noticed while looking at StylePendingImage
https://bugs.webkit.org/show_bug.cgi?id=125618
Reviewed by Andreas Kling.
* css/StyleResolver.cpp:
(WebCore::StyleResolver::loadPendingImage): Removed redundant function calls.
* rendering/RenderImageResource.cpp: Removed unneeded nullImage and
usesImageContainerSize member functions.
(WebCore::RenderImageResource::image): Use Image::nullImage directly instead of
through RenderImageResourceImage::nullImage.
* rendering/RenderImageResource.h: Removed unneeded usesImageContainerSize
and nullImage functions. Also removed unneeded includes.
* rendering/RenderImageResourceStyleImage.h: Removed unneeded
usesImageContainerSize override. Nobody was calling it.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160477 => 160478)
--- trunk/Source/WebCore/ChangeLog 2013-12-12 06:38:56 UTC (rev 160477)
+++ trunk/Source/WebCore/ChangeLog 2013-12-12 08:44:32 UTC (rev 160478)
@@ -1,3 +1,24 @@
+2013-12-11 Darin Adler <[email protected]>
+
+ Remove some unneeded code noticed while looking at StylePendingImage
+ https://bugs.webkit.org/show_bug.cgi?id=125618
+
+ Reviewed by Andreas Kling.
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::loadPendingImage): Removed redundant function calls.
+
+ * rendering/RenderImageResource.cpp: Removed unneeded nullImage and
+ usesImageContainerSize member functions.
+ (WebCore::RenderImageResource::image): Use Image::nullImage directly instead of
+ through RenderImageResourceImage::nullImage.
+
+ * rendering/RenderImageResource.h: Removed unneeded usesImageContainerSize
+ and nullImage functions. Also removed unneeded includes.
+
+ * rendering/RenderImageResourceStyleImage.h: Removed unneeded
+ usesImageContainerSize override. Nobody was calling it.
+
2013-12-11 Benjamin Poulain <[email protected]>
Add the CFNetwork implementation of the asynchronous ResourceHandle
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (160477 => 160478)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2013-12-12 06:38:56 UTC (rev 160477)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2013-12-12 08:44:32 UTC (rev 160478)
@@ -3876,32 +3876,23 @@
PassRefPtr<StyleImage> StyleResolver::loadPendingImage(StylePendingImage* pendingImage)
{
- CachedResourceLoader* cachedResourceLoader = m_state.document().cachedResourceLoader();
+ if (auto imageValue = pendingImage->cssImageValue())
+ return imageValue->cachedImage(m_state.document().cachedResourceLoader());
- if (pendingImage->cssImageValue()) {
- CSSImageValue* imageValue = pendingImage->cssImageValue();
- return imageValue->cachedImage(cachedResourceLoader);
- }
-
- if (pendingImage->cssImageGeneratorValue()) {
- CSSImageGeneratorValue* imageGeneratorValue = pendingImage->cssImageGeneratorValue();
- imageGeneratorValue->loadSubimages(cachedResourceLoader);
+ if (auto imageGeneratorValue = pendingImage->cssImageGeneratorValue()) {
+ imageGeneratorValue->loadSubimages(m_state.document().cachedResourceLoader());
return StyleGeneratedImage::create(imageGeneratorValue);
}
- if (pendingImage->cssCursorImageValue()) {
- CSSCursorImageValue* cursorImageValue = pendingImage->cssCursorImageValue();
- return cursorImageValue->cachedImage(cachedResourceLoader);
- }
+ if (auto cursorImageValue = pendingImage->cssCursorImageValue())
+ return cursorImageValue->cachedImage(m_state.document().cachedResourceLoader());
#if ENABLE(CSS_IMAGE_SET)
- if (pendingImage->cssImageSetValue()) {
- CSSImageSetValue* imageSetValue = pendingImage->cssImageSetValue();
- return imageSetValue->cachedImageSet(cachedResourceLoader);
- }
+ if (CSSImageSetValue* imageSetValue = pendingImage->cssImageSetValue())
+ return imageSetValue->cachedImageSet(m_state.document().cachedResourceLoader());
#endif
- return 0;
+ return nullptr;
}
Modified: trunk/Source/WebCore/rendering/RenderImageResource.cpp (160477 => 160478)
--- trunk/Source/WebCore/rendering/RenderImageResource.cpp 2013-12-12 06:38:56 UTC (rev 160477)
+++ trunk/Source/WebCore/rendering/RenderImageResource.cpp 2013-12-12 08:44:32 UTC (rev 160478)
@@ -91,7 +91,7 @@
PassRefPtr<Image> RenderImageResource::image(int, int) const
{
- return m_cachedImage ? m_cachedImage->imageForRenderer(m_renderer) : nullImage();
+ return m_cachedImage ? m_cachedImage->imageForRenderer(m_renderer) : Image::nullImage();
}
bool RenderImageResource::errorOccurred() const
@@ -106,16 +106,6 @@
m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSize, m_renderer->style().effectiveZoom());
}
-Image* RenderImageResource::nullImage()
-{
- return Image::nullImage();
-}
-
-bool RenderImageResource::usesImageContainerSize() const
-{
- return m_cachedImage ? m_cachedImage->usesImageContainerSize() : false;
-}
-
bool RenderImageResource::imageHasRelativeWidth() const
{
return m_cachedImage ? m_cachedImage->imageHasRelativeWidth() : false;
Modified: trunk/Source/WebCore/rendering/RenderImageResource.h (160477 => 160478)
--- trunk/Source/WebCore/rendering/RenderImageResource.h 2013-12-12 06:38:56 UTC (rev 160477)
+++ trunk/Source/WebCore/rendering/RenderImageResource.h 2013-12-12 08:44:32 UTC (rev 160478)
@@ -27,12 +27,12 @@
#define RenderImageResource_h
#include "CachedResourceHandle.h"
-#include "Image.h"
-#include "LayoutSize.h"
#include "StyleImage.h"
+#include <wtf/PassOwnPtr.h>
namespace WebCore {
+class CachedImage;
class RenderElement;
class RenderImageResource {
@@ -58,7 +58,6 @@
virtual bool errorOccurred() const;
virtual void setContainerSizeForRenderer(const IntSize&);
- virtual bool usesImageContainerSize() const;
virtual bool imageHasRelativeWidth() const;
virtual bool imageHasRelativeHeight() const;
@@ -69,11 +68,9 @@
protected:
RenderImageResource();
+
RenderElement* m_renderer;
CachedResourceHandle<CachedImage> m_cachedImage;
-
-private:
- static Image* nullImage();
};
} // namespace WebCore
Modified: trunk/Source/WebCore/rendering/RenderImageResourceStyleImage.h (160477 => 160478)
--- trunk/Source/WebCore/rendering/RenderImageResourceStyleImage.h 2013-12-12 06:38:56 UTC (rev 160477)
+++ trunk/Source/WebCore/rendering/RenderImageResourceStyleImage.h 2013-12-12 08:44:32 UTC (rev 160478)
@@ -52,7 +52,6 @@
virtual bool errorOccurred() const OVERRIDE { return m_styleImage->errorOccurred(); }
virtual void setContainerSizeForRenderer(const IntSize&) OVERRIDE;
- virtual bool usesImageContainerSize() const OVERRIDE { return m_styleImage->usesImageContainerSize(); }
virtual bool imageHasRelativeWidth() const OVERRIDE { return m_styleImage->imageHasRelativeWidth(); }
virtual bool imageHasRelativeHeight() const OVERRIDE { return m_styleImage->imageHasRelativeHeight(); }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
