<!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>[160478] 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/160478">160478</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2013-12-12 00:44:32 -0800 (Thu, 12 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImageResourcecpp">trunk/Source/WebCore/rendering/RenderImageResource.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImageResourceh">trunk/Source/WebCore/rendering/RenderImageResource.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImageResourceStyleImageh">trunk/Source/WebCore/rendering/RenderImageResourceStyleImage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160477 => 160478)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2013-12-11 Darin Adler <darin@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2013-12-11 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Add the CFNetwork implementation of the asynchronous ResourceHandle
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (160477 => 160478)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3876,32 +3876,23 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<StyleImage> StyleResolver::loadPendingImage(StylePendingImage* pendingImage)
</span><span class="cx"> {
</span><del>- CachedResourceLoader* cachedResourceLoader = m_state.document().cachedResourceLoader();
</del><ins>+ if (auto imageValue = pendingImage->cssImageValue())
+ return imageValue->cachedImage(m_state.document().cachedResourceLoader());
</ins><span class="cx">
</span><del>- if (pendingImage->cssImageValue()) {
- CSSImageValue* imageValue = pendingImage->cssImageValue();
- return imageValue->cachedImage(cachedResourceLoader);
- }
-
- if (pendingImage->cssImageGeneratorValue()) {
- CSSImageGeneratorValue* imageGeneratorValue = pendingImage->cssImageGeneratorValue();
- imageGeneratorValue->loadSubimages(cachedResourceLoader);
</del><ins>+ if (auto imageGeneratorValue = pendingImage->cssImageGeneratorValue()) {
+ imageGeneratorValue->loadSubimages(m_state.document().cachedResourceLoader());
</ins><span class="cx"> return StyleGeneratedImage::create(imageGeneratorValue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (pendingImage->cssCursorImageValue()) {
- CSSCursorImageValue* cursorImageValue = pendingImage->cssCursorImageValue();
- return cursorImageValue->cachedImage(cachedResourceLoader);
- }
</del><ins>+ if (auto cursorImageValue = pendingImage->cssCursorImageValue())
+ return cursorImageValue->cachedImage(m_state.document().cachedResourceLoader());
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_IMAGE_SET)
</span><del>- if (pendingImage->cssImageSetValue()) {
- CSSImageSetValue* imageSetValue = pendingImage->cssImageSetValue();
- return imageSetValue->cachedImageSet(cachedResourceLoader);
- }
</del><ins>+ if (CSSImageSetValue* imageSetValue = pendingImage->cssImageSetValue())
+ return imageSetValue->cachedImageSet(m_state.document().cachedResourceLoader());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImageResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImageResource.cpp (160477 => 160478)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Image> RenderImageResource::image(int, int) const
</span><span class="cx"> {
</span><del>- return m_cachedImage ? m_cachedImage->imageForRenderer(m_renderer) : nullImage();
</del><ins>+ return m_cachedImage ? m_cachedImage->imageForRenderer(m_renderer) : Image::nullImage();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderImageResource::errorOccurred() const
</span><span class="lines">@@ -106,16 +106,6 @@
</span><span class="cx"> m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSize, m_renderer->style().effectiveZoom());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Image* RenderImageResource::nullImage()
-{
- return Image::nullImage();
-}
-
-bool RenderImageResource::usesImageContainerSize() const
-{
- return m_cachedImage ? m_cachedImage->usesImageContainerSize() : false;
-}
-
</del><span class="cx"> bool RenderImageResource::imageHasRelativeWidth() const
</span><span class="cx"> {
</span><span class="cx"> return m_cachedImage ? m_cachedImage->imageHasRelativeWidth() : false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImageResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImageResource.h (160477 => 160478)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -27,12 +27,12 @@
</span><span class="cx"> #define RenderImageResource_h
</span><span class="cx">
</span><span class="cx"> #include "CachedResourceHandle.h"
</span><del>-#include "Image.h"
-#include "LayoutSize.h"
</del><span class="cx"> #include "StyleImage.h"
</span><ins>+#include <wtf/PassOwnPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class CachedImage;
</ins><span class="cx"> class RenderElement;
</span><span class="cx">
</span><span class="cx"> class RenderImageResource {
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> virtual bool errorOccurred() const;
</span><span class="cx">
</span><span class="cx"> virtual void setContainerSizeForRenderer(const IntSize&);
</span><del>- virtual bool usesImageContainerSize() const;
</del><span class="cx"> virtual bool imageHasRelativeWidth() const;
</span><span class="cx"> virtual bool imageHasRelativeHeight() const;
</span><span class="cx">
</span><span class="lines">@@ -69,11 +68,9 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> RenderImageResource();
</span><ins>+
</ins><span class="cx"> RenderElement* m_renderer;
</span><span class="cx"> CachedResourceHandle<CachedImage> m_cachedImage;
</span><del>-
-private:
- static Image* nullImage();
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImageResourceStyleImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImageResourceStyleImage.h (160477 => 160478)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> virtual bool errorOccurred() const OVERRIDE { return m_styleImage->errorOccurred(); }
</span><span class="cx">
</span><span class="cx"> virtual void setContainerSizeForRenderer(const IntSize&) OVERRIDE;
</span><del>- virtual bool usesImageContainerSize() const OVERRIDE { return m_styleImage->usesImageContainerSize(); }
</del><span class="cx"> virtual bool imageHasRelativeWidth() const OVERRIDE { return m_styleImage->imageHasRelativeWidth(); }
</span><span class="cx"> virtual bool imageHasRelativeHeight() const OVERRIDE { return m_styleImage->imageHasRelativeHeight(); }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>