<!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>[205346] 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/205346">205346</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-02 09:26:40 -0700 (Fri, 02 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/205344">r205344</a>.
https://bugs.webkit.org/show_bug.cgi?id=161533
Hitting assertions under CachedResource::removeClient in a few
tests (Requested by anttik on #webkit).
Reverted changeset:
"Reverse ownership relation of StyleCachedImage and
CSSImageValue"
https://bugs.webkit.org/show_bug.cgi?id=161447
http://trac.webkit.org/changeset/205344</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSCursorImageValuecpp">trunk/Source/WebCore/css/CSSCursorImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSCursorImageValueh">trunk/Source/WebCore/css/CSSCursorImageValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageGeneratorValuecpp">trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageSetValuecpp">trunk/Source/WebCore/css/CSSImageSetValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageSetValueh">trunk/Source/WebCore/css/CSSImageSetValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageValuecpp">trunk/Source/WebCore/css/CSSImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageValueh">trunk/Source/WebCore/css/CSSImageValue.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
<li><a href="#trunkSourceWebCorepagePageSerializercpp">trunk/Source/WebCore/page/PageSerializer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleFillLayercpp">trunk/Source/WebCore/rendering/style/FillLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleCachedImagecpp">trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleCachedImageh">trunk/Source/WebCore/rendering/style/StyleCachedImage.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleGeneratedImageh">trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleImageh">trunk/Source/WebCore/rendering/style/StyleImage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205345 => 205346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-02 15:54:20 UTC (rev 205345)
+++ trunk/Source/WebCore/ChangeLog 2016-09-02 16:26:40 UTC (rev 205346)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-09-02 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r205344.
+ https://bugs.webkit.org/show_bug.cgi?id=161533
+
+ Hitting assertions under CachedResource::removeClient in a few
+ tests (Requested by anttik on #webkit).
+
+ Reverted changeset:
+
+ "Reverse ownership relation of StyleCachedImage and
+ CSSImageValue"
+ https://bugs.webkit.org/show_bug.cgi?id=161447
+ http://trac.webkit.org/changeset/205344
+
</ins><span class="cx"> 2016-09-02 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Reverse ownership relation of StyleCachedImage and CSSImageValue
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCursorImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCursorImageValue.cpp (205345 => 205346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCursorImageValue.cpp 2016-09-02 15:54:20 UTC (rev 205345)
+++ trunk/Source/WebCore/css/CSSCursorImageValue.cpp 2016-09-02 16:26:40 UTC (rev 205346)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "CSSImageValue.h"
</span><span class="cx"> #include "CachedImage.h"
</span><span class="cx"> #include "CachedResourceLoader.h"
</span><ins>+#include "StyleCachedImage.h"
+#include "StyleImage.h"
</ins><span class="cx"> #include "SVGCursorElement.h"
</span><span class="cx"> #include "SVGLengthContext.h"
</span><span class="cx"> #include "SVGNames.h"
</span><span class="lines">@@ -107,30 +109,27 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (auto* cursorElement = updateCursorElement(*loader.document())) {
- if (cursorElement->href() != downcast<CSSImageValue>(m_imageValue.get()).url())
- m_imageValue = CSSImageValue::create(cursorElement->href());
- }
-
</del><span class="cx"> downcast<CSSImageValue>(m_imageValue.get()).loadImage(loader, options);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CachedImage* CSSCursorImageValue::cachedImage() const
</del><ins>+StyleCachedImage& CSSCursorImageValue::styleImage(const Document& document)
</ins><span class="cx"> {
</span><ins>+ // Need to delegate completely so that changes in device scale factor can be handled appropriately.
+ StyleCachedImage* styleImage;
</ins><span class="cx"> if (is<CSSImageSetValue>(m_imageValue.get()))
</span><del>- return downcast<CSSImageSetValue>(m_imageValue.get()).cachedImage();
</del><ins>+ styleImage = &downcast<CSSImageSetValue>(m_imageValue.get()).styleImage(document);
+ else {
+ if (auto* cursorElement = updateCursorElement(document)) {
+ if (cursorElement->href() != downcast<CSSImageValue>(m_imageValue.get()).url())
+ m_imageValue = CSSImageValue::create(cursorElement->href());
+ }
+ styleImage = &downcast<CSSImageValue>(m_imageValue.get()).styleImage();
+ }
+ styleImage->setCSSValue(*this);
</ins><span class="cx">
</span><del>- return downcast<CSSImageValue>(m_imageValue.get()).cachedImage();
</del><ins>+ return *styleImage;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-float CSSCursorImageValue::scaleFactor() const
-{
- if (is<CSSImageSetValue>(m_imageValue.get()))
- return downcast<CSSImageSetValue>(m_imageValue.get()).bestFitScaleFactor();
-
- return 1;
-}
-
</del><span class="cx"> bool CSSCursorImageValue::equals(const CSSCursorImageValue& other) const
</span><span class="cx"> {
</span><span class="cx"> return m_hasHotSpot ? other.m_hasHotSpot && m_hotSpot == other.m_hotSpot : !other.m_hasHotSpot
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCursorImageValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCursorImageValue.h (205345 => 205346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCursorImageValue.h 2016-09-02 15:54:20 UTC (rev 205345)
+++ trunk/Source/WebCore/css/CSSCursorImageValue.h 2016-09-02 16:26:40 UTC (rev 205346)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> class Element;
</span><span class="cx"> class SVGCursorElement;
</span><span class="cx"> class SVGElement;
</span><ins>+class StyleCachedImage;
</ins><span class="cx">
</span><span class="cx"> class CSSCursorImageValue final : public CSSValue {
</span><span class="cx"> public:
</span><span class="lines">@@ -53,10 +54,8 @@
</span><span class="cx"> String customCSSText() const;
</span><span class="cx">
</span><span class="cx"> void loadImage(CachedResourceLoader&, const ResourceLoaderOptions&);
</span><del>- CachedImage* cachedImage() const;
</del><ins>+ StyleCachedImage& styleImage(const Document&);
</ins><span class="cx">
</span><del>- float scaleFactor() const;
-
</del><span class="cx"> void removeReferencedElement(SVGElement*);
</span><span class="cx">
</span><span class="cx"> bool equals(const CSSCursorImageValue&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageGeneratorValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp (205345 => 205346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp 2016-09-02 15:54:20 UTC (rev 205345)
+++ trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp 2016-09-02 16:26:40 UTC (rev 205346)
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> if (is<CSSImageValue>(value)) {
</span><span class="cx"> auto& imageValue = downcast<CSSImageValue>(value);
</span><span class="cx"> imageValue.loadImage(cachedResourceLoader, options);
</span><del>- return imageValue.cachedImage();
</del><ins>+ return imageValue.styleImage().cachedImage();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (is<CSSImageGeneratorValue>(value)) {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageSetValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageSetValue.cpp (205345 => 205346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageSetValue.cpp 2016-09-02 15:54:20 UTC (rev 205345)
+++ trunk/Source/WebCore/css/CSSImageSetValue.cpp 2016-09-02 16:26:40 UTC (rev 205346)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "CrossOriginAccessControl.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "Page.h"
</span><ins>+#include "StyleCachedImage.h"
</ins><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -41,11 +42,15 @@
</span><span class="cx">
</span><span class="cx"> CSSImageSetValue::CSSImageSetValue()
</span><span class="cx"> : CSSValueList(ImageSetClass, CommaSeparator)
</span><ins>+ , m_accessedBestFitImage(false)
+ , m_scaleFactor(1)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSImageSetValue::~CSSImageSetValue()
</span><span class="cx"> {
</span><ins>+ if (m_image)
+ m_image->detachFromCSSValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CSSImageSetValue::fillImageSet()
</span><span class="lines">@@ -74,14 +79,11 @@
</span><span class="cx">
</span><span class="cx"> CSSImageSetValue::ImageWithScale CSSImageSetValue::bestImageForScaleFactor()
</span><span class="cx"> {
</span><del>- if (!m_imagesInSet.size())
- fillImageSet();
-
</del><span class="cx"> ImageWithScale image;
</span><span class="cx"> size_t numberOfImages = m_imagesInSet.size();
</span><span class="cx"> for (size_t i = 0; i < numberOfImages; ++i) {
</span><span class="cx"> image = m_imagesInSet.at(i);
</span><del>- if (image.scaleFactor >= m_deviceScaleFactor)
</del><ins>+ if (image.scaleFactor >= m_scaleFactor)
</ins><span class="cx"> return image;
</span><span class="cx"> }
</span><span class="cx"> return image;
</span><span class="lines">@@ -90,11 +92,16 @@
</span><span class="cx"> void CSSImageSetValue::loadBestFitImage(CachedResourceLoader& loader, const ResourceLoaderOptions& options)
</span><span class="cx"> {
</span><span class="cx"> Document* document = loader.document();
</span><del>- updateDeviceScaleFactor(*document);
-
</del><ins>+ if (Page* page = document->page())
+ m_scaleFactor = page->deviceScaleFactor();
+ else
+ m_scaleFactor = 1;
+
+ if (!m_imagesInSet.size())
+ fillImageSet();
+
</ins><span class="cx"> if (m_accessedBestFitImage)
</span><span class="cx"> return;
</span><del>-
</del><span class="cx"> // FIXME: In the future, we want to take much more than deviceScaleFactor into acount here.
</span><span class="cx"> // All forms of scale should be included: Page::pageScaleFactor(), Frame::pageZoomFactor(),
</span><span class="cx"> // and any CSS transforms. https://bugs.webkit.org/show_bug.cgi?id=81698
</span><span class="lines">@@ -105,19 +112,30 @@
</span><span class="cx"> ASSERT(document->securityOrigin());
</span><span class="cx"> updateRequestForAccessControl(request.mutableResourceRequest(), *document->securityOrigin(), options.allowCredentials);
</span><span class="cx"> }
</span><del>- m_cachedImage = loader.requestImage(request);
- m_bestFitImageScaleFactor = image.scaleFactor;
- m_accessedBestFitImage = true;
</del><ins>+ if (CachedResourceHandle<CachedImage> cachedImage = loader.requestImage(request)) {
+ styleImage(*document).setCachedImage(*cachedImage, image.scaleFactor);
+ m_accessedBestFitImage = true;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSImageSetValue::updateDeviceScaleFactor(const Document& document)
</del><ins>+StyleCachedImage& CSSImageSetValue::styleImage(const Document& document)
</ins><span class="cx"> {
</span><del>- float deviceScaleFactor = document.page() ? document.page()->deviceScaleFactor() : 1;
- if (deviceScaleFactor == m_deviceScaleFactor)
- return;
- m_deviceScaleFactor = deviceScaleFactor;
- m_accessedBestFitImage = false;
- m_cachedImage = nullptr;
</del><ins>+ if (!m_image)
+ m_image = StyleCachedImage::create(*this);
+ else if (!m_image->isPending()) {
+ float deviceScaleFactor = 1;
+ if (Page* page = document.page())
+ deviceScaleFactor = page->deviceScaleFactor();
+
+ // If the deviceScaleFactor has changed, we may not have the best image loaded, so we have to re-assess.
+ if (deviceScaleFactor != m_scaleFactor) {
+ m_accessedBestFitImage = false;
+ m_image->detachFromCSSValue();
+ m_image = StyleCachedImage::create(*this);
+ }
+ }
+
+ return *m_image;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String CSSImageSetValue::customCSSText() const
</span><span class="lines">@@ -152,13 +170,18 @@
</span><span class="cx">
</span><span class="cx"> bool CSSImageSetValue::traverseSubresources(const std::function<bool (const CachedResource&)>& handler) const
</span><span class="cx"> {
</span><del>- if (!m_cachedImage)
</del><ins>+ if (!m_image)
</ins><span class="cx"> return false;
</span><del>- return handler(*m_cachedImage);
</del><ins>+ CachedImage* cachedResource = m_image->cachedImage();
+ if (!cachedResource)
+ return false;
+ return handler(*cachedResource);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSImageSetValue::CSSImageSetValue(const CSSImageSetValue& cloneFrom)
</span><span class="cx"> : CSSValueList(cloneFrom)
</span><ins>+ , m_accessedBestFitImage(false)
+ , m_scaleFactor(1)
</ins><span class="cx"> {
</span><span class="cx"> // Non-CSSValueList data is not accessible through CSS OM, no need to clone.
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageSetValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageSetValue.h (205345 => 205346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageSetValue.h 2016-09-02 15:54:20 UTC (rev 205345)
+++ trunk/Source/WebCore/css/CSSImageSetValue.h 2016-09-02 16:26:40 UTC (rev 205346)
</span><span class="lines">@@ -27,17 +27,18 @@
</span><span class="cx"> #define CSSImageSetValue_h
</span><span class="cx">
</span><span class="cx"> #include "CSSValueList.h"
</span><del>-#include "CachedImageClient.h"
-#include "CachedResourceHandle.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CachedResourceLoader;
</span><span class="cx"> class Document;
</span><ins>+class StyleCachedImage;
+class StyleImage;
</ins><span class="cx"> struct ResourceLoaderOptions;
</span><span class="cx">
</span><span class="cx"> class CSSImageSetValue final : public CSSValueList {
</span><span class="cx"> public:
</span><ins>+
</ins><span class="cx"> static Ref<CSSImageSetValue> create()
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new CSSImageSetValue());
</span><span class="lines">@@ -45,11 +46,11 @@
</span><span class="cx"> ~CSSImageSetValue();
</span><span class="cx">
</span><span class="cx"> void loadBestFitImage(CachedResourceLoader&, const ResourceLoaderOptions&);
</span><del>- CachedImage* cachedImage() const { return m_cachedImage.get(); }
</del><ins>+ StyleCachedImage& styleImage(const Document&);
</ins><span class="cx">
</span><span class="cx"> String customCSSText() const;
</span><span class="cx">
</span><del>- float bestFitScaleFactor() const { return m_bestFitImageScaleFactor; };
</del><ins>+ bool isPending() const { return !m_accessedBestFitImage; }
</ins><span class="cx">
</span><span class="cx"> struct ImageWithScale {
</span><span class="cx"> String imageURL;
</span><span class="lines">@@ -60,8 +61,6 @@
</span><span class="cx">
</span><span class="cx"> Ref<CSSImageSetValue> cloneForCSSOM() const;
</span><span class="cx">
</span><del>- void updateDeviceScaleFactor(const Document&);
-
</del><span class="cx"> protected:
</span><span class="cx"> ImageWithScale bestImageForScaleFactor();
</span><span class="cx">
</span><span class="lines">@@ -72,11 +71,13 @@
</span><span class="cx"> void fillImageSet();
</span><span class="cx"> static inline bool compareByScaleFactor(ImageWithScale first, ImageWithScale second) { return first.scaleFactor < second.scaleFactor; }
</span><span class="cx">
</span><del>- CachedResourceHandle<CachedImage> m_cachedImage;
- bool m_accessedBestFitImage { false };
- float m_bestFitImageScaleFactor { 1 };
- float m_deviceScaleFactor { 1 };
</del><ins>+ RefPtr<StyleCachedImage> m_image;
+ bool m_accessedBestFitImage;
</ins><span class="cx">
</span><ins>+ // This represents the scale factor that we used to find the best fit image. It does not necessarily
+ // correspond to the scale factor of the best fit image.
+ float m_scaleFactor;
+
</ins><span class="cx"> Vector<ImageWithScale> m_imagesInSet;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageValue.cpp (205345 => 205346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageValue.cpp 2016-09-02 15:54:20 UTC (rev 205345)
+++ trunk/Source/WebCore/css/CSSImageValue.cpp 2016-09-02 16:26:40 UTC (rev 205346)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "MemoryCache.h"
</span><ins>+#include "StyleCachedImage.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -45,21 +46,32 @@
</span><span class="cx"> CSSImageValue::CSSImageValue(CachedImage& image)
</span><span class="cx"> : CSSValue(ImageClass)
</span><span class="cx"> , m_url(image.url())
</span><del>- , m_cachedImage(&image)
</del><ins>+ , m_image(StyleCachedImage::create(*this))
</ins><span class="cx"> , m_accessedImage(true)
</span><span class="cx"> {
</span><ins>+ m_image->setCachedImage(image);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> CSSImageValue::~CSSImageValue()
</span><span class="cx"> {
</span><ins>+ if (m_image)
+ m_image->detachFromCSSValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSImageValue::isPending() const
</span><span class="cx"> {
</span><del>- return !m_accessedImage;
</del><ins>+ return !m_image || !m_image->cachedImage();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+StyleCachedImage& CSSImageValue::styleImage()
+{
+ if (!m_image)
+ m_image = StyleCachedImage::create(*this);
+
+ return *m_image;
+}
+
</ins><span class="cx"> void CSSImageValue::loadImage(CachedResourceLoader& loader, const ResourceLoaderOptions& options)
</span><span class="cx"> {
</span><span class="cx"> if (m_accessedImage)
</span><span class="lines">@@ -76,14 +88,18 @@
</span><span class="cx"> ASSERT(loader.document()->securityOrigin());
</span><span class="cx"> updateRequestForAccessControl(request.mutableResourceRequest(), *loader.document()->securityOrigin(), options.allowCredentials);
</span><span class="cx"> }
</span><del>- m_cachedImage = loader.requestImage(request);
</del><ins>+ if (CachedResourceHandle<CachedImage> cachedImage = loader.requestImage(request))
+ styleImage().setCachedImage(*cachedImage);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSImageValue::traverseSubresources(const std::function<bool (const CachedResource&)>& handler) const
</span><span class="cx"> {
</span><del>- if (!m_cachedImage)
</del><ins>+ if (!m_image)
</ins><span class="cx"> return false;
</span><del>- return handler(*m_cachedImage);
</del><ins>+ CachedResource* cachedResource = m_image->cachedImage();
+ if (!cachedResource)
+ return false;
+ return handler(*cachedResource);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSImageValue::equals(const CSSImageValue& other) const
</span><span class="lines">@@ -106,9 +122,7 @@
</span><span class="cx">
</span><span class="cx"> bool CSSImageValue::knownToBeOpaque(const RenderElement* renderer) const
</span><span class="cx"> {
</span><del>- if (!m_cachedImage)
- return false;
- return m_cachedImage->currentFrameKnownToBeOpaque(renderer);
</del><ins>+ return m_image ? m_image->knownToBeOpaque(renderer) : false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageValue.h (205345 => 205346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageValue.h 2016-09-02 15:54:20 UTC (rev 205345)
+++ trunk/Source/WebCore/css/CSSImageValue.h 2016-09-02 16:26:40 UTC (rev 205346)
</span><span class="lines">@@ -22,7 +22,6 @@
</span><span class="cx"> #define CSSImageValue_h
</span><span class="cx">
</span><span class="cx"> #include "CSSValue.h"
</span><del>-#include "CachedResourceHandle.h"
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -30,6 +29,7 @@
</span><span class="cx"> class CachedImage;
</span><span class="cx"> class CachedResourceLoader;
</span><span class="cx"> class Element;
</span><ins>+class StyleCachedImage;
</ins><span class="cx"> class RenderElement;
</span><span class="cx"> struct ResourceLoaderOptions;
</span><span class="cx">
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> bool isPending() const;
</span><span class="cx"> void loadImage(CachedResourceLoader&, const ResourceLoaderOptions&);
</span><del>- CachedImage* cachedImage() const { return m_cachedImage.get(); }
</del><ins>+ StyleCachedImage& styleImage();
</ins><span class="cx">
</span><span class="cx"> const String& url() const { return m_url; }
</span><span class="cx">
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> explicit CSSImageValue(CachedImage&);
</span><span class="cx">
</span><span class="cx"> String m_url;
</span><del>- CachedResourceHandle<CachedImage> m_cachedImage;
</del><ins>+ RefPtr<StyleCachedImage> m_image;
</ins><span class="cx"> bool m_accessedImage;
</span><span class="cx"> AtomicString m_initiatorName;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (205345 => 205346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2016-09-02 15:54:20 UTC (rev 205345)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2016-09-02 16:26:40 UTC (rev 205346)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx"> #include "SVGElement.h"
</span><span class="cx"> #include "SVGRenderStyle.h"
</span><span class="cx"> #include "StyleBuilderConverter.h"
</span><del>-#include "StyleCachedImage.h"
</del><span class="cx"> #include "StyleFontSizeFunctions.h"
</span><span class="cx"> #include "StyleGeneratedImage.h"
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="lines">@@ -1314,12 +1313,12 @@
</span><span class="cx"> styleResolver.style()->setContent(StyleGeneratedImage::create(downcast<CSSImageGeneratorValue>(item.get())), didSet);
</span><span class="cx"> didSet = true;
</span><span class="cx"> } else if (is<CSSImageSetValue>(item.get())) {
</span><del>- styleResolver.style()->setContent(styleResolver.styleCachedImageFromValue(CSSPropertyContent, item), didSet);
</del><ins>+ styleResolver.style()->setContent(styleResolver.setOrPendingFromValue(CSSPropertyContent, downcast<CSSImageSetValue>(item.get())), didSet);
</ins><span class="cx"> didSet = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (is<CSSImageValue>(item.get())) {
</span><del>- styleResolver.style()->setContent(styleResolver.styleCachedImageFromValue(CSSPropertyContent, item), didSet);
</del><ins>+ styleResolver.style()->setContent(styleResolver.cachedOrPendingFromValue(CSSPropertyContent, downcast<CSSImageValue>(item.get())), didSet);
</ins><span class="cx"> didSet = true;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (205345 => 205346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2016-09-02 15:54:20 UTC (rev 205345)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2016-09-02 16:26:40 UTC (rev 205346)
</span><span class="lines">@@ -1702,27 +1702,33 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<StyleImage> StyleResolver::styleImage(CSSPropertyID property, CSSValue& value)
</span><span class="cx"> {
</span><ins>+ if (is<CSSImageValue>(value))
+ return cachedOrPendingFromValue(property, downcast<CSSImageValue>(value));
+
</ins><span class="cx"> if (is<CSSImageGeneratorValue>(value)) {
</span><span class="cx"> if (is<CSSGradientValue>(value))
</span><del>- return styleGeneratedImageFromValue(property, *downcast<CSSGradientValue>(value).gradientWithStylesResolved(this));
- return styleGeneratedImageFromValue(property, downcast<CSSImageGeneratorValue>(value));
</del><ins>+ return generatedOrPendingFromValue(property, *downcast<CSSGradientValue>(value).gradientWithStylesResolved(this));
+ return generatedOrPendingFromValue(property, downcast<CSSImageGeneratorValue>(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (is<CSSImageValue>(value) || is<CSSImageSetValue>(value) || is<CSSCursorImageValue>(value))
- return styleCachedImageFromValue(property, value);
</del><ins>+ if (is<CSSImageSetValue>(value))
+ return setOrPendingFromValue(property, downcast<CSSImageSetValue>(value));
</ins><span class="cx">
</span><ins>+ if (is<CSSCursorImageValue>(value))
+ return cursorOrPendingFromValue(property, downcast<CSSCursorImageValue>(value));
+
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<StyleCachedImage> StyleResolver::styleCachedImageFromValue(CSSPropertyID property, CSSValue& value)
</del><ins>+Ref<StyleImage> StyleResolver::cachedOrPendingFromValue(CSSPropertyID property, CSSImageValue& value)
</ins><span class="cx"> {
</span><del>- auto image = StyleCachedImage::create(value);
</del><ins>+ Ref<StyleImage> image = value.styleImage();
</ins><span class="cx"> if (image->isPending())
</span><span class="cx"> m_state.ensurePendingResources().pendingImages.set(property, &value);
</span><span class="cx"> return image;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<StyleGeneratedImage> StyleResolver::styleGeneratedImageFromValue(CSSPropertyID property, CSSImageGeneratorValue& value)
</del><ins>+Ref<StyleImage> StyleResolver::generatedOrPendingFromValue(CSSPropertyID property, CSSImageGeneratorValue& value)
</ins><span class="cx"> {
</span><span class="cx"> if (is<CSSFilterImageValue>(value)) {
</span><span class="cx"> // FilterImage needs to calculate FilterOperations.
</span><span class="lines">@@ -1734,6 +1740,22 @@
</span><span class="cx"> return StyleGeneratedImage::create(value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<StyleImage> StyleResolver::setOrPendingFromValue(CSSPropertyID property, CSSImageSetValue& value)
+{
+ auto& image = value.styleImage(document());
+ if (image.isPending())
+ m_state.ensurePendingResources().pendingImages.set(property, &value);
+ return &image;
+}
+
+RefPtr<StyleImage> StyleResolver::cursorOrPendingFromValue(CSSPropertyID property, CSSCursorImageValue& value)
+{
+ auto& image = value.styleImage(document());
+ if (image.isPending())
+ m_state.ensurePendingResources().pendingImages.set(property, &value);
+ return &image;
+}
+
</ins><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> void StyleResolver::checkForTextSizeAdjust(RenderStyle* style)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (205345 => 205346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2016-09-02 15:54:20 UTC (rev 205345)
+++ trunk/Source/WebCore/css/StyleResolver.h 2016-09-02 16:26:40 UTC (rev 205346)
</span><span class="lines">@@ -72,8 +72,6 @@
</span><span class="cx"> class RuleSet;
</span><span class="cx"> class SelectorFilter;
</span><span class="cx"> class Settings;
</span><del>-class StyleCachedImage;
-class StyleGeneratedImage;
</del><span class="cx"> class StyleImage;
</span><span class="cx"> class StyleKeyframe;
</span><span class="cx"> class StylePendingImage;
</span><span class="lines">@@ -460,8 +458,10 @@
</span><span class="cx"> const State& state() const { return m_state; }
</span><span class="cx">
</span><span class="cx"> RefPtr<StyleImage> styleImage(CSSPropertyID, CSSValue&);
</span><del>- Ref<StyleCachedImage> styleCachedImageFromValue(CSSPropertyID, CSSValue&);
- Ref<StyleGeneratedImage> styleGeneratedImageFromValue(CSSPropertyID, CSSImageGeneratorValue&);
</del><ins>+ Ref<StyleImage> cachedOrPendingFromValue(CSSPropertyID, CSSImageValue&);
+ Ref<StyleImage> generatedOrPendingFromValue(CSSPropertyID, CSSImageGeneratorValue&);
+ RefPtr<StyleImage> setOrPendingFromValue(CSSPropertyID, CSSImageSetValue&);
+ RefPtr<StyleImage> cursorOrPendingFromValue(CSSPropertyID, CSSCursorImageValue&);
</ins><span class="cx">
</span><span class="cx"> bool applyPropertyToRegularStyle() const { return m_state.applyPropertyToRegularStyle(); }
</span><span class="cx"> bool applyPropertyToVisitedLinkStyle() const { return m_state.applyPropertyToVisitedLinkStyle(); }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageSerializercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageSerializer.cpp (205345 => 205346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageSerializer.cpp 2016-09-02 15:54:20 UTC (rev 205345)
+++ trunk/Source/WebCore/page/PageSerializer.cpp 2016-09-02 16:26:40 UTC (rev 205346)
</span><span class="lines">@@ -331,7 +331,9 @@
</span><span class="cx"> if (!is<CSSImageValue>(*cssValue))
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- auto* image = downcast<CSSImageValue>(*cssValue).cachedImage();
</del><ins>+ auto& styleImage = downcast<CSSImageValue>(*cssValue).styleImage();
+
+ auto* image = styleImage.cachedImage();
</ins><span class="cx"> if (!image)
</span><span class="cx"> continue;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleFillLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/FillLayer.cpp (205345 => 205346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/FillLayer.cpp 2016-09-02 15:54:20 UTC (rev 205345)
+++ trunk/Source/WebCore/rendering/style/FillLayer.cpp 2016-09-02 16:26:40 UTC (rev 205346)
</span><span class="lines">@@ -380,10 +380,16 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline bool layerImagesIdentical(const FillLayer& layer1, const FillLayer& layer2)
+{
+ // We just care about pointer equivalency.
+ return layer1.image() == layer2.image();
+}
+
</ins><span class="cx"> bool FillLayer::imagesIdentical(const FillLayer* layer1, const FillLayer* layer2)
</span><span class="cx"> {
</span><span class="cx"> for (; layer1 && layer2; layer1 = layer1->next(), layer2 = layer2->next()) {
</span><del>- if (!arePointingToEqualData(layer1->image(), layer2->image()))
</del><ins>+ if (!layerImagesIdentical(*layer1, *layer2))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleCachedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp (205345 => 205346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp 2016-09-02 15:54:20 UTC (rev 205345)
+++ trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp 2016-09-02 16:26:40 UTC (rev 205346)
</span><span class="lines">@@ -24,9 +24,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "StyleCachedImage.h"
</span><span class="cx">
</span><del>-#include "CSSCursorImageValue.h"
</del><span class="cx"> #include "CSSImageSetValue.h"
</span><del>-#include "CSSImageValue.h"
</del><span class="cx"> #include "CachedImage.h"
</span><span class="cx"> #include "RenderElement.h"
</span><span class="cx">
</span><span class="lines">@@ -33,90 +31,63 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> StyleCachedImage::StyleCachedImage(CSSValue& cssValue)
</span><del>- : m_cssValue(cssValue)
</del><ins>+ : m_cssValue(&cssValue)
</ins><span class="cx"> {
</span><del>- ASSERT(is<CSSImageValue>(m_cssValue) || is<CSSImageSetValue>(m_cssValue) || is<CSSCursorImageValue>(m_cssValue));
-
</del><span class="cx"> m_isCachedImage = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StyleCachedImage::~StyleCachedImage()
</span><span class="cx"> {
</span><ins>+ if (m_image)
+ m_image->removeClient(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool StyleCachedImage::operator==(const StyleImage& other) const
</del><ins>+void StyleCachedImage::setCachedImage(CachedImage& image, float scaleFactor)
</ins><span class="cx"> {
</span><del>- if (!is<StyleCachedImage>(other))
- return false;
- auto& otherCached = downcast<StyleCachedImage>(other);
- if (&otherCached == this)
- return true;
- if (m_cssValue.ptr() == otherCached.m_cssValue.ptr())
- return true;
- if (m_cachedImage && m_cachedImage == otherCached.m_cachedImage)
- return true;
- return false;
</del><ins>+ ASSERT(!m_image);
+ m_image = &image;
+ m_image->addClient(this);
+ m_scaleFactor = scaleFactor;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-CachedImage* StyleCachedImage::cachedImage() const
-{
- if (!m_cachedImage) {
- if (is<CSSImageValue>(m_cssValue)) {
- auto& imageValue = downcast<CSSImageValue>(m_cssValue.get());
- m_cachedImage = imageValue.cachedImage();
- } else if (is<CSSImageSetValue>(m_cssValue)) {
- auto& imageSetValue = downcast<CSSImageSetValue>(m_cssValue.get());
- m_cachedImage = imageSetValue.cachedImage();
- m_scaleFactor = imageSetValue.bestFitScaleFactor();
- } else if (is<CSSCursorImageValue>(m_cssValue.get())) {
- auto& cursorValue = downcast<CSSCursorImageValue>(m_cssValue.get());
- m_cachedImage = cursorValue.cachedImage();
- m_scaleFactor = cursorValue.scaleFactor();
- }
- }
- return m_cachedImage.get();
-}
-
</del><span class="cx"> PassRefPtr<CSSValue> StyleCachedImage::cssValue() const
</span><span class="cx"> {
</span><del>- return const_cast<CSSValue*>(m_cssValue.ptr());
</del><ins>+ if (m_cssValue)
+ return m_cssValue;
+ return CSSPrimitiveValue::create(m_image->url(), CSSPrimitiveValue::CSS_URI);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool StyleCachedImage::canRender(const RenderObject* renderer, float multiplier) const
</span><span class="cx"> {
</span><del>- auto* image = cachedImage();
- if (!image)
</del><ins>+ if (!m_image)
</ins><span class="cx"> return false;
</span><del>- return image->canRender(renderer, multiplier);
</del><ins>+ return m_image->canRender(renderer, multiplier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool StyleCachedImage::isPending() const
</span><span class="cx"> {
</span><del>- return !m_cachedImage;
</del><ins>+ return !m_image;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool StyleCachedImage::isLoaded() const
</span><span class="cx"> {
</span><del>- auto* image = cachedImage();
- if (!image)
</del><ins>+ if (!m_image)
</ins><span class="cx"> return false;
</span><del>- return image->isLoaded();
</del><ins>+ return m_image->isLoaded();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool StyleCachedImage::errorOccurred() const
</span><span class="cx"> {
</span><del>- auto* image = cachedImage();
- if (!image)
</del><ins>+ if (!m_image)
</ins><span class="cx"> return false;
</span><del>- return image->errorOccurred();
</del><ins>+ return m_image->errorOccurred();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatSize StyleCachedImage::imageSize(const RenderElement* renderer, float multiplier) const
</span><span class="cx"> {
</span><del>- auto* image = cachedImage();
- if (!image)
</del><ins>+ if (!m_image)
</ins><span class="cx"> return { };
</span><del>- FloatSize size = image->imageSizeForRenderer(renderer, multiplier);
</del><ins>+ FloatSize size = m_image->imageSizeForRenderer(renderer, multiplier);
</ins><span class="cx"> size.scale(1 / m_scaleFactor);
</span><span class="cx"> return size;
</span><span class="cx"> }
</span><span class="lines">@@ -123,66 +94,58 @@
</span><span class="cx">
</span><span class="cx"> bool StyleCachedImage::imageHasRelativeWidth() const
</span><span class="cx"> {
</span><del>- auto* image = cachedImage();
- if (!image)
</del><ins>+ if (!m_image)
</ins><span class="cx"> return false;
</span><del>- return image->imageHasRelativeWidth();
</del><ins>+ return m_image->imageHasRelativeWidth();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool StyleCachedImage::imageHasRelativeHeight() const
</span><span class="cx"> {
</span><del>- auto* image = cachedImage();
- if (!image)
</del><ins>+ if (!m_image)
</ins><span class="cx"> return false;
</span><del>- return image->imageHasRelativeHeight();
</del><ins>+ return m_image->imageHasRelativeHeight();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StyleCachedImage::computeIntrinsicDimensions(const RenderElement*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
</span><span class="cx"> {
</span><del>- auto* image = cachedImage();
- if (!image)
</del><ins>+ if (!m_image)
</ins><span class="cx"> return;
</span><del>- image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
</del><ins>+ m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool StyleCachedImage::usesImageContainerSize() const
</span><span class="cx"> {
</span><del>- auto* image = cachedImage();
- if (!image)
</del><ins>+ if (!m_image)
</ins><span class="cx"> return false;
</span><del>- return image->usesImageContainerSize();
</del><ins>+ return m_image->usesImageContainerSize();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StyleCachedImage::setContainerSizeForRenderer(const RenderElement* renderer, const FloatSize& imageContainerSize, float imageContainerZoomFactor)
</span><span class="cx"> {
</span><del>- auto* image = cachedImage();
- if (!image)
</del><ins>+ if (!m_image)
</ins><span class="cx"> return;
</span><del>- image->setContainerSizeForRenderer(renderer, LayoutSize(imageContainerSize), imageContainerZoomFactor);
</del><ins>+ m_image->setContainerSizeForRenderer(renderer, LayoutSize(imageContainerSize), imageContainerZoomFactor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StyleCachedImage::addClient(RenderElement* renderer)
</span><span class="cx"> {
</span><del>- auto* image = cachedImage();
- if (!image)
</del><ins>+ if (!m_image)
</ins><span class="cx"> return;
</span><del>- image->addClient(renderer);
</del><ins>+ m_image->addClient(renderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StyleCachedImage::removeClient(RenderElement* renderer)
</span><span class="cx"> {
</span><del>- auto* image = cachedImage();
- if (!image)
</del><ins>+ if (!m_image)
</ins><span class="cx"> return;
</span><del>- image->removeClient(renderer);
</del><ins>+ m_image->removeClient(renderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<Image> StyleCachedImage::image(RenderElement* renderer, const FloatSize&) const
</span><span class="cx"> {
</span><del>- auto* image = cachedImage();
- if (!image)
</del><ins>+ if (!m_image)
</ins><span class="cx"> return nullptr;
</span><del>- return image->imageForRenderer(renderer);
</del><ins>+ return m_image->imageForRenderer(renderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float StyleCachedImage::imageScaleFactor() const
</span><span class="lines">@@ -192,10 +155,9 @@
</span><span class="cx">
</span><span class="cx"> bool StyleCachedImage::knownToBeOpaque(const RenderElement* renderer) const
</span><span class="cx"> {
</span><del>- auto* image = cachedImage();
- if (!image)
</del><ins>+ if (!m_image)
</ins><span class="cx"> return false;
</span><del>- return image->currentFrameKnownToBeOpaque(renderer);
</del><ins>+ return m_image->currentFrameKnownToBeOpaque(renderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleCachedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleCachedImage.h (205345 => 205346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleCachedImage.h 2016-09-02 15:54:20 UTC (rev 205345)
+++ trunk/Source/WebCore/rendering/style/StyleCachedImage.h 2016-09-02 16:26:40 UTC (rev 205346)
</span><span class="lines">@@ -32,20 +32,22 @@
</span><span class="cx">
</span><span class="cx"> class CSSValue;
</span><span class="cx"> class CachedImage;
</span><del>-class Document;
</del><span class="cx">
</span><del>-class StyleCachedImage final : public StyleImage {
</del><ins>+class StyleCachedImage final : public StyleImage, private CachedImageClient {
</ins><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> static Ref<StyleCachedImage> create(CSSValue& cssValue) { return adoptRef(*new StyleCachedImage(cssValue)); }
</span><span class="cx"> virtual ~StyleCachedImage();
</span><span class="cx">
</span><del>- bool operator==(const StyleImage& other) const override;
</del><ins>+ CachedImage* cachedImage() const override { return m_image.get(); }
</ins><span class="cx">
</span><del>- CachedImage* cachedImage() const override;
</del><ins>+ void detachFromCSSValue() { m_cssValue = nullptr; }
+ void setCSSValue(CSSValue& value) { m_cssValue = &value; }
</ins><span class="cx">
</span><del>- WrappedImagePtr data() const override { return m_cachedImage.get(); }
</del><ins>+ void setCachedImage(CachedImage&, float scaleFactor = 1);
</ins><span class="cx">
</span><ins>+ WrappedImagePtr data() const override { return m_image.get(); }
+
</ins><span class="cx"> PassRefPtr<CSSValue> cssValue() const override;
</span><span class="cx">
</span><span class="cx"> bool canRender(const RenderObject*, float multiplier) const override;
</span><span class="lines">@@ -67,9 +69,9 @@
</span><span class="cx"> private:
</span><span class="cx"> StyleCachedImage(CSSValue&);
</span><span class="cx">
</span><del>- Ref<CSSValue> m_cssValue;
- mutable float m_scaleFactor { 1 };
- mutable CachedResourceHandle<CachedImage> m_cachedImage;
</del><ins>+ CSSValue* m_cssValue;
+ float m_scaleFactor { 1 };
+ CachedResourceHandle<CachedImage> m_image;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleGeneratedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h (205345 => 205346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h 2016-09-02 15:54:20 UTC (rev 205345)
+++ trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h 2016-09-02 16:26:40 UTC (rev 205346)
</span><span class="lines">@@ -41,8 +41,6 @@
</span><span class="cx"> CSSImageGeneratorValue& imageValue() { return m_imageGeneratorValue; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- bool operator==(const StyleImage& other) const override { return data() == other.data(); }
-
</del><span class="cx"> WrappedImagePtr data() const override { return m_imageGeneratorValue.ptr(); }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<CSSValue> cssValue() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleImage.h (205345 => 205346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleImage.h 2016-09-02 15:54:20 UTC (rev 205345)
+++ trunk/Source/WebCore/rendering/style/StyleImage.h 2016-09-02 16:26:40 UTC (rev 205346)
</span><span class="lines">@@ -45,7 +45,10 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~StyleImage() { }
</span><span class="cx">
</span><del>- virtual bool operator==(const StyleImage& other) const = 0;
</del><ins>+ bool operator==(const StyleImage& other) const
+ {
+ return &other == this || (data() && data() == other.data());
+ }
</ins><span class="cx">
</span><span class="cx"> virtual PassRefPtr<CSSValue> cssValue() const = 0;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>