<!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>[160528] 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/160528">160528</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2013-12-12 22:52:57 -0800 (Thu, 12 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make some improvements in CSSImageGeneratorValue code
https://bugs.webkit.org/show_bug.cgi?id=125676
Reviewed by Simon Fraser.
* css/CSSCrossfadeValue.cpp:
(WebCore::subimageKnownToBeOpaque): Take a reference to the CSSValue, since
it's known not to be null. Used checked cast.
(WebCore::CSSCrossfadeValue::knownToBeOpaque): Updated to pass a reference.
* css/CSSImageGeneratorValue.cpp:
(WebCore::CSSImageGeneratorValue::saveCachedImageForSize): Use
make_unique instead of adoptPtr.
(WebCore::CSSImageGeneratorValue::subimageIsPending): Use checked cast.
(WebCore::CSSImageGeneratorValue::cachedImageForCSSValue): Ditto, also
use nullptr.
* css/CSSImageGeneratorValue.h: Removed unneeded includes, added some forward
declarations, used unique_ptr instead of OwnPtr, and used CSS_VALUE_TYPE_CASTS
macro to create cast functions.
* css/CSSValue.cpp: Removed unneeded include of CSSImageGeneratorValue.h.
* css/StyleResolver.cpp:
(WebCore::StyleResolver::State::clear): Use nullptr instead of 0.
(WebCore::StyleResolver::applyProperty): Use checked cast and pass references
instead of pointers to StyleGeneratedImage::create.
(WebCore::StyleResolver::styleImage): Use checked cast and pass references
instead of pointers to generatedOrPendingFromValue.
(WebCore::StyleResolver::generatedOrPendingFromValue): Take the value as a
reference instead of a pointer.
(WebCore::StyleResolver::loadPendingImage): Pass a refernece instead of a
pointer to StyleGeneratedImage::create.
(WebCore::StyleResolver::loadPendingImages): Use auto for iteration instead of
a lot type name.
* css/StyleResolver.h: Changed generatedOrPendingFromValue to take the value
as a reference instead of a pointer.
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::blendFilter): Pass a reference insted of a pointer to
StyleGeneratedImage::create.
(WebCore::crossfadeBlend): Ditto.
(WebCore::blendFunc): Ditto. Also use references for local variables.
* rendering/style/StyleGeneratedImage.cpp:
(WebCore::StyleGeneratedImage::StyleGeneratedImage): Use PassRef instead of
PassRefPtr for the argument type.
(WebCore::StyleGeneratedImage::cssValue): Updated since m_imageGeneratorValue
is now a Ref instead of a RefPtr. Sadly this requires a const_cast that we can
come back and get rid of later.
(WebCore::StyleGeneratedImage::imageSize): Ditto.
(WebCore::StyleGeneratedImage::image): Ditto.
* rendering/style/StyleGeneratedImage.h: Changed create function and constructor
to take a PassRef. Made imageValue non-const since it returns a non-const value,
to be consistent with "conceptual const". Changed m_imageGeneratorValue to be a
Ref instead of a RefPtr.
* rendering/style/StyleImage.h: Made WrappedImagePtr be const void*, since it's
a pointer used only for equality checks. Not a great idiom, but fine to use a
const pointer instead of non-const, and avoids the const_cast we'd otherwise
need in StyleGeneratedImage::data.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSCrossfadeValuecpp">trunk/Source/WebCore/css/CSSCrossfadeValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageGeneratorValuecpp">trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageGeneratorValueh">trunk/Source/WebCore/css/CSSImageGeneratorValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSValuecpp">trunk/Source/WebCore/css/CSSValue.cpp</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="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleGeneratedImagecpp">trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp</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 (160527 => 160528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-13 05:51:32 UTC (rev 160527)
+++ trunk/Source/WebCore/ChangeLog 2013-12-13 06:52:57 UTC (rev 160528)
</span><span class="lines">@@ -1,3 +1,69 @@
</span><ins>+2013-12-12 Darin Adler <darin@apple.com>
+
+ Make some improvements in CSSImageGeneratorValue code
+ https://bugs.webkit.org/show_bug.cgi?id=125676
+
+ Reviewed by Simon Fraser.
+
+ * css/CSSCrossfadeValue.cpp:
+ (WebCore::subimageKnownToBeOpaque): Take a reference to the CSSValue, since
+ it's known not to be null. Used checked cast.
+ (WebCore::CSSCrossfadeValue::knownToBeOpaque): Updated to pass a reference.
+
+ * css/CSSImageGeneratorValue.cpp:
+ (WebCore::CSSImageGeneratorValue::saveCachedImageForSize): Use
+ make_unique instead of adoptPtr.
+ (WebCore::CSSImageGeneratorValue::subimageIsPending): Use checked cast.
+ (WebCore::CSSImageGeneratorValue::cachedImageForCSSValue): Ditto, also
+ use nullptr.
+
+ * css/CSSImageGeneratorValue.h: Removed unneeded includes, added some forward
+ declarations, used unique_ptr instead of OwnPtr, and used CSS_VALUE_TYPE_CASTS
+ macro to create cast functions.
+
+ * css/CSSValue.cpp: Removed unneeded include of CSSImageGeneratorValue.h.
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::State::clear): Use nullptr instead of 0.
+ (WebCore::StyleResolver::applyProperty): Use checked cast and pass references
+ instead of pointers to StyleGeneratedImage::create.
+ (WebCore::StyleResolver::styleImage): Use checked cast and pass references
+ instead of pointers to generatedOrPendingFromValue.
+ (WebCore::StyleResolver::generatedOrPendingFromValue): Take the value as a
+ reference instead of a pointer.
+ (WebCore::StyleResolver::loadPendingImage): Pass a refernece instead of a
+ pointer to StyleGeneratedImage::create.
+ (WebCore::StyleResolver::loadPendingImages): Use auto for iteration instead of
+ a lot type name.
+
+ * css/StyleResolver.h: Changed generatedOrPendingFromValue to take the value
+ as a reference instead of a pointer.
+
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::blendFilter): Pass a reference insted of a pointer to
+ StyleGeneratedImage::create.
+ (WebCore::crossfadeBlend): Ditto.
+ (WebCore::blendFunc): Ditto. Also use references for local variables.
+
+ * rendering/style/StyleGeneratedImage.cpp:
+ (WebCore::StyleGeneratedImage::StyleGeneratedImage): Use PassRef instead of
+ PassRefPtr for the argument type.
+ (WebCore::StyleGeneratedImage::cssValue): Updated since m_imageGeneratorValue
+ is now a Ref instead of a RefPtr. Sadly this requires a const_cast that we can
+ come back and get rid of later.
+ (WebCore::StyleGeneratedImage::imageSize): Ditto.
+ (WebCore::StyleGeneratedImage::image): Ditto.
+
+ * rendering/style/StyleGeneratedImage.h: Changed create function and constructor
+ to take a PassRef. Made imageValue non-const since it returns a non-const value,
+ to be consistent with "conceptual const". Changed m_imageGeneratorValue to be a
+ Ref instead of a RefPtr.
+
+ * rendering/style/StyleImage.h: Made WrappedImagePtr be const void*, since it's
+ a pointer used only for equality checks. Not a great idiom, but fine to use a
+ const pointer instead of non-const, and avoids the const_cast we'd otherwise
+ need in StyleGeneratedImage::data.
+
</ins><span class="cx"> 2013-12-12 KyungTae Kim <ktf.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Improve the find word boundary performance
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCrossfadeValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCrossfadeValue.cpp (160527 => 160528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCrossfadeValue.cpp 2013-12-13 05:51:32 UTC (rev 160527)
+++ trunk/Source/WebCore/css/CSSCrossfadeValue.cpp 2013-12-13 06:52:57 UTC (rev 160528)
</span><span class="lines">@@ -44,13 +44,13 @@
</span><span class="cx"> return blend(from, to, progress);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool subimageKnownToBeOpaque(CSSValue* value, const RenderElement* renderer)
</del><ins>+static bool subimageKnownToBeOpaque(CSSValue& value, const RenderElement* renderer)
</ins><span class="cx"> {
</span><del>- if (value->isImageValue())
- return toCSSImageValue(value)->knownToBeOpaque(renderer);
</del><ins>+ if (value.isImageValue())
+ return toCSSImageValue(value).knownToBeOpaque(renderer);
</ins><span class="cx">
</span><del>- if (value->isImageGeneratorValue())
- return static_cast<CSSImageGeneratorValue*>(value)->knownToBeOpaque(renderer);
</del><ins>+ if (value.isImageGeneratorValue())
+ return toCSSImageGeneratorValue(value).knownToBeOpaque(renderer);
</ins><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx">
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">
</span><span class="cx"> bool CSSCrossfadeValue::knownToBeOpaque(const RenderElement* renderer) const
</span><span class="cx"> {
</span><del>- return subimageKnownToBeOpaque(m_fromValue.get(), renderer) && subimageKnownToBeOpaque(m_toValue.get(), renderer);
</del><ins>+ return subimageKnownToBeOpaque(*m_fromValue, renderer) && subimageKnownToBeOpaque(*m_toValue, renderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CSSCrossfadeValue::loadSubimages(CachedResourceLoader* cachedResourceLoader)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageGeneratorValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp (160527 => 160528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp 2013-12-13 05:51:32 UTC (rev 160527)
+++ trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp 2013-12-13 06:52:57 UTC (rev 160528)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "CSSFilterImageValue.h"
</span><span class="cx"> #include "CSSGradientValue.h"
</span><span class="cx"> #include "CSSImageValue.h"
</span><ins>+#include "GeneratedImage.h"
</ins><span class="cx"> #include "Image.h"
</span><span class="cx"> #include "RenderElement.h"
</span><span class="cx"> #include "StyleCachedImage.h"
</span><span class="lines">@@ -80,7 +81,7 @@
</span><span class="cx"> void CSSImageGeneratorValue::saveCachedImageForSize(IntSize size, PassRefPtr<GeneratedImage> image)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_images.contains(size));
</span><del>- m_images.add(size, adoptPtr(new CachedGeneratedImage(*this, size, image)));
</del><ins>+ m_images.add(size, std::make_unique<CachedGeneratedImage>(*this, size, image));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CSSImageGeneratorValue::evictCachedGeneratedImage(IntSize size)
</span><span class="lines">@@ -240,7 +241,7 @@
</span><span class="cx"> return toCSSImageValue(value)->cachedOrPendingImage()->isPendingImage();
</span><span class="cx">
</span><span class="cx"> if (value->isImageGeneratorValue())
</span><del>- return static_cast<CSSImageGeneratorValue*>(value)->isPending();
</del><ins>+ return toCSSImageGeneratorValue(value)->isPending();
</ins><span class="cx">
</span><span class="cx"> if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueNone)
</span><span class="cx"> return false;
</span><span class="lines">@@ -253,27 +254,27 @@
</span><span class="cx"> CachedImage* CSSImageGeneratorValue::cachedImageForCSSValue(CSSValue* value, CachedResourceLoader* cachedResourceLoader)
</span><span class="cx"> {
</span><span class="cx"> if (!value)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> if (value->isImageValue()) {
</span><span class="cx"> StyleCachedImage* styleCachedImage = toCSSImageValue(value)->cachedImage(cachedResourceLoader);
</span><span class="cx"> if (!styleCachedImage)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return styleCachedImage->cachedImage();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (value->isImageGeneratorValue()) {
</span><del>- static_cast<CSSImageGeneratorValue*>(value)->loadSubimages(cachedResourceLoader);
</del><ins>+ toCSSImageGeneratorValue(value)->loadSubimages(cachedResourceLoader);
</ins><span class="cx"> // FIXME: Handle CSSImageGeneratorValue (and thus cross-fades with gradients and canvas).
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueNone)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageGeneratorValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageGeneratorValue.h (160527 => 160528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageGeneratorValue.h 2013-12-13 05:51:32 UTC (rev 160527)
+++ trunk/Source/WebCore/css/CSSImageGeneratorValue.h 2013-12-13 06:52:57 UTC (rev 160528)
</span><span class="lines">@@ -27,17 +27,16 @@
</span><span class="cx"> #define CSSImageGeneratorValue_h
</span><span class="cx">
</span><span class="cx"> #include "CSSValue.h"
</span><del>-#include "CachedImage.h"
-#include "GeneratedImage.h"
</del><span class="cx"> #include "IntSizeHash.h"
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <wtf/HashCountedSet.h>
</span><del>-#include <wtf/RefPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class CachedImage;
</ins><span class="cx"> class CachedResourceLoader;
</span><span class="cx"> class GeneratedImage;
</span><ins>+class Image;
</ins><span class="cx"> class RenderElement;
</span><span class="cx"> class StyleResolver;
</span><span class="cx">
</span><span class="lines">@@ -89,9 +88,11 @@
</span><span class="cx"> void evictCachedGeneratedImage(IntSize);
</span><span class="cx">
</span><span class="cx"> HashCountedSet<RenderElement*> m_clients;
</span><del>- HashMap<IntSize, OwnPtr<CachedGeneratedImage>> m_images;
</del><ins>+ HashMap<IntSize, std::unique_ptr<CachedGeneratedImage>> m_images;
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+CSS_VALUE_TYPE_CASTS(CSSImageGeneratorValue, isImageGeneratorValue())
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // CSSImageGeneratorValue_h
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.cpp (160527 => 160528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValue.cpp 2013-12-13 05:51:32 UTC (rev 160527)
+++ trunk/Source/WebCore/css/CSSValue.cpp 2013-12-13 06:52:57 UTC (rev 160528)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> #include "CSSFunctionValue.h"
</span><span class="cx"> #include "CSSGradientValue.h"
</span><span class="cx"> #include "CSSGridTemplateValue.h"
</span><del>-#include "CSSImageGeneratorValue.h"
</del><span class="cx"> #include "CSSImageSetValue.h"
</span><span class="cx"> #include "CSSImageValue.h"
</span><span class="cx"> #include "CSSInheritedValue.h"
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (160527 => 160528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2013-12-13 05:51:32 UTC (rev 160527)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2013-12-13 06:52:57 UTC (rev 160528)
</span><span class="lines">@@ -218,11 +218,11 @@
</span><span class="cx">
</span><span class="cx"> inline void StyleResolver::State::clear()
</span><span class="cx"> {
</span><del>- m_element = 0;
- m_styledElement = 0;
- m_parentStyle = 0;
- m_parentNode = 0;
- m_regionForStyling = 0;
</del><ins>+ m_element = nullptr;
+ m_styledElement = nullptr;
+ m_parentStyle = nullptr;
+ m_parentNode = nullptr;
+ m_regionForStyling = nullptr;
</ins><span class="cx"> m_pendingImageProperties.clear();
</span><span class="cx"> #if ENABLE(CSS_SHADERS)
</span><span class="cx"> m_hasPendingShaders = false;
</span><span class="lines">@@ -2090,9 +2090,9 @@
</span><span class="cx"> CSSValue* item = i.value();
</span><span class="cx"> if (item->isImageGeneratorValue()) {
</span><span class="cx"> if (item->isGradientValue())
</span><del>- state.style()->setContent(StyleGeneratedImage::create(toCSSGradientValue(item)->gradientWithStylesResolved(this).get()), didSet);
</del><ins>+ state.style()->setContent(StyleGeneratedImage::create(*toCSSGradientValue(item)->gradientWithStylesResolved(this)), didSet);
</ins><span class="cx"> else
</span><del>- state.style()->setContent(StyleGeneratedImage::create(static_cast<CSSImageGeneratorValue*>(item)), didSet);
</del><ins>+ state.style()->setContent(StyleGeneratedImage::create(*toCSSImageGeneratorValue(item)), didSet);
</ins><span class="cx"> didSet = true;
</span><span class="cx"> #if ENABLE(CSS_IMAGE_SET)
</span><span class="cx"> } else if (item->isImageSetValue()) {
</span><span class="lines">@@ -3067,8 +3067,8 @@
</span><span class="cx">
</span><span class="cx"> if (value->isImageGeneratorValue()) {
</span><span class="cx"> if (value->isGradientValue())
</span><del>- return generatedOrPendingFromValue(property, toCSSGradientValue(value)->gradientWithStylesResolved(this).get());
- return generatedOrPendingFromValue(property, static_cast<CSSImageGeneratorValue*>(value));
</del><ins>+ return generatedOrPendingFromValue(property, *toCSSGradientValue(value)->gradientWithStylesResolved(this));
+ return generatedOrPendingFromValue(property, toCSSImageGeneratorValue(*value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_IMAGE_SET)
</span><span class="lines">@@ -3090,17 +3090,17 @@
</span><span class="cx"> return image.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<StyleImage> StyleResolver::generatedOrPendingFromValue(CSSPropertyID property, CSSImageGeneratorValue* value)
</del><ins>+PassRefPtr<StyleImage> StyleResolver::generatedOrPendingFromValue(CSSPropertyID property, CSSImageGeneratorValue& value)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><del>- if (value->isFilterImageValue()) {
</del><ins>+ if (value.isFilterImageValue()) {
</ins><span class="cx"> // FilterImage needs to calculate FilterOperations.
</span><del>- toCSSFilterImageValue(value)->createFilterOperations(this);
</del><ins>+ toCSSFilterImageValue(value).createFilterOperations(this);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- if (value->isPending()) {
- m_state.pendingImageProperties().set(property, value);
- return StylePendingImage::create(value);
</del><ins>+ if (value.isPending()) {
+ m_state.pendingImageProperties().set(property, &value);
+ return StylePendingImage::create(&value);
</ins><span class="cx"> }
</span><span class="cx"> return StyleGeneratedImage::create(value);
</span><span class="cx"> }
</span><span class="lines">@@ -3881,7 +3881,7 @@
</span><span class="cx">
</span><span class="cx"> if (auto imageGeneratorValue = pendingImage->cssImageGeneratorValue()) {
</span><span class="cx"> imageGeneratorValue->loadSubimages(m_state.document().cachedResourceLoader());
</span><del>- return StyleGeneratedImage::create(imageGeneratorValue);
</del><ins>+ return StyleGeneratedImage::create(*imageGeneratorValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (auto cursorImageValue = pendingImage->cssCursorImageValue())
</span><span class="lines">@@ -3923,8 +3923,8 @@
</span><span class="cx"> if (m_state.pendingImageProperties().isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- PendingImagePropertyMap::const_iterator::Keys end = m_state.pendingImageProperties().end().keys();
- for (PendingImagePropertyMap::const_iterator::Keys it = m_state.pendingImageProperties().begin().keys(); it != end; ++it) {
</del><ins>+ auto end = m_state.pendingImageProperties().end().keys();
+ for (auto it = m_state.pendingImageProperties().begin().keys(); it != end; ++it) {
</ins><span class="cx"> CSSPropertyID currentProperty = *it;
</span><span class="cx">
</span><span class="cx"> switch (currentProperty) {
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (160527 => 160528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2013-12-13 05:51:32 UTC (rev 160527)
+++ trunk/Source/WebCore/css/StyleResolver.h 2013-12-13 06:52:57 UTC (rev 160528)
</span><span class="lines">@@ -503,7 +503,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<StyleImage> styleImage(CSSPropertyID, CSSValue*);
</span><span class="cx"> PassRefPtr<StyleImage> cachedOrPendingFromValue(CSSPropertyID, CSSImageValue*);
</span><del>- PassRefPtr<StyleImage> generatedOrPendingFromValue(CSSPropertyID, CSSImageGeneratorValue*);
</del><ins>+ PassRefPtr<StyleImage> generatedOrPendingFromValue(CSSPropertyID, CSSImageGeneratorValue&);
</ins><span class="cx"> #if ENABLE(CSS_IMAGE_SET)
</span><span class="cx"> PassRefPtr<StyleImage> setOrPendingFromValue(CSSPropertyID, CSSImageSetValue*);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (160527 => 160528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2013-12-13 05:51:32 UTC (rev 160527)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2013-12-13 06:52:57 UTC (rev 160528)
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> RefPtr<CSSFilterImageValue> result = CSSFilterImageValue::create(std::move(imageValue), filterValue);
</span><span class="cx"> result->setFilterOperations(filterResult);
</span><span class="cx">
</span><del>- return StyleGeneratedImage::create(result.get());
</del><ins>+ return StyleGeneratedImage::create(*result);
</ins><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(CSS_FILTERS)
</span><span class="cx">
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx">
</span><span class="cx"> crossfadeValue->setPercentage(CSSPrimitiveValue::create(progress, CSSPrimitiveValue::CSS_NUMBER));
</span><span class="cx">
</span><del>- return StyleGeneratedImage::create(crossfadeValue.get());
</del><ins>+ return StyleGeneratedImage::create(*crossfadeValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline PassRefPtr<StyleImage> blendFunc(const AnimationBase* anim, StyleImage* from, StyleImage* to, double progress)
</span><span class="lines">@@ -298,42 +298,42 @@
</span><span class="cx">
</span><span class="cx"> // Animation between two generated images. Cross fade for all other cases.
</span><span class="cx"> if (from->isGeneratedImage() && to->isGeneratedImage()) {
</span><del>- CSSImageGeneratorValue* fromGenerated = toStyleGeneratedImage(from)->imageValue();
- CSSImageGeneratorValue* toGenerated = toStyleGeneratedImage(to)->imageValue();
</del><ins>+ CSSImageGeneratorValue& fromGenerated = toStyleGeneratedImage(from)->imageValue();
+ CSSImageGeneratorValue& toGenerated = toStyleGeneratedImage(to)->imageValue();
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><del>- if (fromGenerated->isFilterImageValue() && toGenerated->isFilterImageValue()) {
</del><ins>+ if (fromGenerated.isFilterImageValue() && toGenerated.isFilterImageValue()) {
</ins><span class="cx"> // Animation of generated images just possible if input images are equal.
</span><span class="cx"> // Otherwise fall back to cross fade animation.
</span><del>- CSSFilterImageValue& fromFilter = *toCSSFilterImageValue(fromGenerated);
- CSSFilterImageValue& toFilter = *toCSSFilterImageValue(toGenerated);
</del><ins>+ CSSFilterImageValue& fromFilter = toCSSFilterImageValue(fromGenerated);
+ CSSFilterImageValue& toFilter = toCSSFilterImageValue(toGenerated);
</ins><span class="cx"> if (fromFilter.equalInputImages(toFilter) && fromFilter.cachedImage())
</span><span class="cx"> return blendFilter(anim, fromFilter.cachedImage(), fromFilter.filterOperations(), toFilter.filterOperations(), progress);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (fromGenerated->isCrossfadeValue() && toGenerated->isCrossfadeValue()) {
- CSSCrossfadeValue& fromCrossfade = *toCSSCrossfadeValue(fromGenerated);
- CSSCrossfadeValue& toCrossfade = *toCSSCrossfadeValue(toGenerated);
</del><ins>+ if (fromGenerated.isCrossfadeValue() && toGenerated.isCrossfadeValue()) {
+ CSSCrossfadeValue& fromCrossfade = toCSSCrossfadeValue(fromGenerated);
+ CSSCrossfadeValue& toCrossfade = toCSSCrossfadeValue(toGenerated);
</ins><span class="cx"> if (fromCrossfade.equalInputImages(toCrossfade))
</span><del>- return StyleGeneratedImage::create(toCrossfade.blend(fromCrossfade, progress).get());
</del><ins>+ return StyleGeneratedImage::create(*toCrossfade.blend(fromCrossfade, progress));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Add support for animation between two *gradient() functions.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=119956
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="cx"> } else if (from->isGeneratedImage() && to->isCachedImage()) {
</span><del>- CSSImageGeneratorValue* fromGenerated = toStyleGeneratedImage(from)->imageValue();
- if (fromGenerated->isFilterImageValue()) {
- CSSFilterImageValue& fromFilter = *toCSSFilterImageValue(fromGenerated);
</del><ins>+ CSSImageGeneratorValue& fromGenerated = toStyleGeneratedImage(from)->imageValue();
+ if (fromGenerated.isFilterImageValue()) {
+ CSSFilterImageValue& fromFilter = toCSSFilterImageValue(fromGenerated);
</ins><span class="cx"> if (fromFilter.cachedImage() && static_cast<StyleCachedImage*>(to)->cachedImage() == fromFilter.cachedImage())
</span><span class="cx"> return blendFilter(anim, fromFilter.cachedImage(), fromFilter.filterOperations(), FilterOperations(), progress);
</span><span class="cx"> }
</span><span class="cx"> // FIXME: Add interpolation between cross-fade and image source.
</span><span class="cx"> } else if (from->isCachedImage() && to->isGeneratedImage()) {
</span><del>- CSSImageGeneratorValue* toGenerated = toStyleGeneratedImage(to)->imageValue();
- if (toGenerated->isFilterImageValue()) {
- CSSFilterImageValue& toFilter = *toCSSFilterImageValue(toGenerated);
</del><ins>+ CSSImageGeneratorValue& toGenerated = toStyleGeneratedImage(to)->imageValue();
+ if (toGenerated.isFilterImageValue()) {
+ CSSFilterImageValue& toFilter = toCSSFilterImageValue(toGenerated);
</ins><span class="cx"> if (toFilter.cachedImage() && static_cast<StyleCachedImage*>(from)->cachedImage() == toFilter.cachedImage())
</span><span class="cx"> return blendFilter(anim, toFilter.cachedImage(), FilterOperations(), toFilter.filterOperations(), progress);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleGeneratedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp (160527 => 160528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp 2013-12-13 05:51:32 UTC (rev 160527)
+++ trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp 2013-12-13 06:52:57 UTC (rev 160528)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-StyleGeneratedImage::StyleGeneratedImage(PassRefPtr<CSSImageGeneratorValue> value)
- : m_imageGeneratorValue(value)
</del><ins>+StyleGeneratedImage::StyleGeneratedImage(PassRef<CSSImageGeneratorValue> value)
+ : m_imageGeneratorValue(std::move(value))
</ins><span class="cx"> , m_fixedSize(m_imageGeneratorValue->isFixedSize())
</span><span class="cx"> {
</span><span class="cx"> m_isGeneratedImage = true;
</span><span class="lines">@@ -39,13 +39,13 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<CSSValue> StyleGeneratedImage::cssValue() const
</span><span class="cx"> {
</span><del>- return m_imageGeneratorValue;
</del><ins>+ return &const_cast<CSSImageGeneratorValue&>(m_imageGeneratorValue.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutSize StyleGeneratedImage::imageSize(const RenderElement* renderer, float multiplier) const
</span><span class="cx"> {
</span><span class="cx"> if (m_fixedSize) {
</span><del>- IntSize fixedSize = m_imageGeneratorValue->fixedSize(renderer);
</del><ins>+ IntSize fixedSize = const_cast<CSSImageGeneratorValue&>(m_imageGeneratorValue.get()).fixedSize(renderer);
</ins><span class="cx"> if (multiplier == 1.0f)
</span><span class="cx"> return fixedSize;
</span><span class="cx">
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Image> StyleGeneratedImage::image(RenderElement* renderer, const IntSize& size) const
</span><span class="cx"> {
</span><del>- return m_imageGeneratorValue->image(renderer, size);
</del><ins>+ return const_cast<CSSImageGeneratorValue&>(m_imageGeneratorValue.get()).image(renderer, size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool StyleGeneratedImage::knownToBeOpaque(const RenderElement* renderer) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleGeneratedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h (160527 => 160528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h 2013-12-13 05:51:32 UTC (rev 160527)
+++ trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h 2013-12-13 06:52:57 UTC (rev 160528)
</span><span class="lines">@@ -33,15 +33,15 @@
</span><span class="cx">
</span><span class="cx"> class StyleGeneratedImage FINAL : public StyleImage {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<StyleGeneratedImage> create(CSSImageGeneratorValue* value)
</del><ins>+ static PassRefPtr<StyleGeneratedImage> create(PassRef<CSSImageGeneratorValue> value)
</ins><span class="cx"> {
</span><del>- return adoptRef(new StyleGeneratedImage(value));
</del><ins>+ return adoptRef(new StyleGeneratedImage(std::move(value)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- CSSImageGeneratorValue* imageValue() const { return m_imageGeneratorValue.get(); }
</del><ins>+ CSSImageGeneratorValue& imageValue() { return m_imageGeneratorValue.get(); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual WrappedImagePtr data() const OVERRIDE { return m_imageGeneratorValue.get(); }
</del><ins>+ virtual WrappedImagePtr data() const OVERRIDE { return &m_imageGeneratorValue.get(); }
</ins><span class="cx">
</span><span class="cx"> virtual PassRefPtr<CSSValue> cssValue() const OVERRIDE;
</span><span class="cx">
</span><span class="lines">@@ -56,9 +56,9 @@
</span><span class="cx"> virtual PassRefPtr<Image> image(RenderElement*, const IntSize&) const OVERRIDE;
</span><span class="cx"> virtual bool knownToBeOpaque(const RenderElement*) const OVERRIDE;
</span><span class="cx">
</span><del>- StyleGeneratedImage(PassRefPtr<CSSImageGeneratorValue>);
</del><ins>+ StyleGeneratedImage(PassRef<CSSImageGeneratorValue>);
</ins><span class="cx">
</span><del>- RefPtr<CSSImageGeneratorValue> m_imageGeneratorValue;
</del><ins>+ Ref<CSSImageGeneratorValue> m_imageGeneratorValue;
</ins><span class="cx"> IntSize m_containerSize;
</span><span class="cx"> bool m_fixedSize;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleImage.h (160527 => 160528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleImage.h 2013-12-13 05:51:32 UTC (rev 160527)
+++ trunk/Source/WebCore/rendering/style/StyleImage.h 2013-12-13 06:52:57 UTC (rev 160528)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> class RenderElement;
</span><span class="cx"> class RenderObject;
</span><span class="cx">
</span><del>-typedef void* WrappedImagePtr;
</del><ins>+typedef const void* WrappedImagePtr;
</ins><span class="cx">
</span><span class="cx"> class StyleImage : public RefCounted<StyleImage> {
</span><span class="cx"> public:
</span></span></pre>
</div>
</div>
</body>
</html>