Modified: trunk/Source/WebCore/ChangeLog (206434 => 206435)
--- trunk/Source/WebCore/ChangeLog 2016-09-27 13:50:42 UTC (rev 206434)
+++ trunk/Source/WebCore/ChangeLog 2016-09-27 14:32:02 UTC (rev 206435)
@@ -1,3 +1,21 @@
+2016-09-27 Youenn Fablet <[email protected]>
+
+ Clean-up CachedImage constructor
+ https://bugs.webkit.org/show_bug.cgi?id=162601
+
+ Reviewed by Sam Weinig.
+
+ No change of behavior.
+ Removing an unused constructor.
+ Specializing one constructor for manually cached images.
+ Cleaning initialization of some CachedImage fields.
+
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::CachedImage):
+ * loader/cache/CachedImage.h:
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::addImageToCache):
+
2016-09-27 Michael Catanzaro <[email protected]>
[FreeType] Add comment further justifying use of FT_LOAD_FORCE_AUTOHINT
Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (206434 => 206435)
--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2016-09-27 13:50:42 UTC (rev 206434)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2016-09-27 14:32:02 UTC (rev 206435)
@@ -58,9 +58,6 @@
CachedImage::CachedImage(CachedResourceRequest&& request, SessionID sessionID)
: CachedResource(WTFMove(request), ImageResource, sessionID)
- , m_image(nullptr)
- , m_isManuallyCached(false)
- , m_shouldPaintBrokenImage(true)
{
setStatus(Unknown);
}
@@ -68,8 +65,6 @@
CachedImage::CachedImage(Image* image, SessionID sessionID)
: CachedResource(URL(), ImageResource, sessionID)
, m_image(image)
- , m_isManuallyCached(false)
- , m_shouldPaintBrokenImage(true)
{
}
@@ -76,27 +71,13 @@
CachedImage::CachedImage(const URL& url, Image* image, SessionID sessionID)
: CachedResource(url, ImageResource, sessionID)
, m_image(image)
- , m_isManuallyCached(false)
- , m_shouldPaintBrokenImage(true)
+ , m_isManuallyCached(true)
{
+ // Use the incoming URL in the response field. This ensures that code using the response directly,
+ // such as origin checks for security, actually see something.
+ m_response.setURL(url);
}
-CachedImage::CachedImage(const URL& url, Image* image, CachedImage::CacheBehaviorType type, SessionID sessionID)
- : CachedResource(url, ImageResource, sessionID)
- , m_image(image)
- , m_isManuallyCached(type == CachedImage::ManuallyCached)
- , m_shouldPaintBrokenImage(true)
-{
- setStatus(Cached);
- setLoading(false);
- if (UNLIKELY(isManuallyCached())) {
- // Use the incoming URL in the response field. This ensures that code
- // using the response directly, such as origin checks for security,
- // actually see something.
- m_response.setURL(url);
- }
-}
-
CachedImage::~CachedImage()
{
clearImage();
Modified: trunk/Source/WebCore/loader/cache/CachedImage.h (206434 => 206435)
--- trunk/Source/WebCore/loader/cache/CachedImage.h 2016-09-27 13:50:42 UTC (rev 206434)
+++ trunk/Source/WebCore/loader/cache/CachedImage.h 2016-09-27 14:32:02 UTC (rev 206435)
@@ -48,12 +48,10 @@
friend class MemoryCache;
public:
- enum CacheBehaviorType { AutomaticallyCached, ManuallyCached };
-
CachedImage(CachedResourceRequest&&, SessionID);
CachedImage(Image*, SessionID);
+ // Constructor to use for manually cached images.
CachedImage(const URL&, Image*, SessionID);
- CachedImage(const URL&, Image*, CacheBehaviorType, SessionID);
virtual ~CachedImage();
WEBCORE_EXPORT Image* image(); // Returns the nullImage() if the image is not available yet.
@@ -136,8 +134,8 @@
RefPtr<Image> m_image;
std::unique_ptr<SVGImageCache> m_svgImageCache;
- unsigned m_isManuallyCached : 1;
- unsigned m_shouldPaintBrokenImage : 1;
+ bool m_isManuallyCached { false };
+ bool m_shouldPaintBrokenImage { true };
};
} // namespace WebCore
Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (206434 => 206435)
--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2016-09-27 13:50:42 UTC (rev 206434)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2016-09-27 14:32:02 UTC (rev 206435)
@@ -220,7 +220,7 @@
if (!bitmapImage)
return false;
- std::unique_ptr<CachedImage> cachedImage = std::make_unique<CachedImage>(url, bitmapImage.get(), CachedImage::ManuallyCached, sessionID);
+ auto cachedImage = std::make_unique<CachedImage>(url, bitmapImage.get(), sessionID);
cachedImage->addClient(&dummyCachedImageClient());
cachedImage->setDecodedSize(bitmapImage->decodedSize());
