<!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>[160541] 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/160541">160541</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2013-12-13 02:32:05 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>CSSFilterImageValue constructor should require both image and filter.
<https://webkit.org/b/125056>
Make the CSSFilterImageValue::create() helper take both the image and
filter CSSValues by PassRef since they should never be null.
Tweaked ComputedStyleExtractor::valueForFilter() to return a PassRef
for this to work.
Reviewed by Anders Carlsson.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationh">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSFilterImageValueh">trunk/Source/WebCore/css/CSSFilterImageValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160540 => 160541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-12-13 10:24:37 UTC (rev 160540)
+++ trunk/Source/WebCore/ChangeLog        2013-12-13 10:32:05 UTC (rev 160541)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-12-13 Andreas Kling <akling@apple.com>
+
+ CSSFilterImageValue constructor should require both image and filter.
+ <https://webkit.org/b/125056>
+
+ Make the CSSFilterImageValue::create() helper take both the image and
+ filter CSSValues by PassRef since they should never be null.
+
+ Tweaked ComputedStyleExtractor::valueForFilter() to return a PassRef
+ for this to work.
+
+ Reviewed by Anders Carlsson.
+
</ins><span class="cx"> 2013-12-12 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> StyleResolver::adjustRenderStyle() should take RenderStyle references.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (160540 => 160541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp        2013-12-13 10:24:37 UTC (rev 160540)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp        2013-12-13 10:32:05 UTC (rev 160541)
</span><span class="lines">@@ -940,7 +940,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><del>-PassRefPtr<CSSValue> ComputedStyleExtractor::valueForFilter(const RenderObject* renderer, const RenderStyle* style, const FilterOperations& filterOperations, AdjustPixelValuesForComputedStyle adjust)
</del><ins>+PassRef<CSSValue> ComputedStyleExtractor::valueForFilter(const RenderObject* renderer, const RenderStyle* style, const FilterOperations& filterOperations, AdjustPixelValuesForComputedStyle adjust)
</ins><span class="cx"> {
</span><span class="cx"> #if !ENABLE(CSS_SHADERS)
</span><span class="cx"> UNUSED_PARAM(renderer);
</span><span class="lines">@@ -948,7 +948,7 @@
</span><span class="cx"> if (filterOperations.operations().isEmpty())
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueNone);
</span><span class="cx">
</span><del>- RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
</del><ins>+ auto list = CSSValueList::createSpaceSeparated();
</ins><span class="cx">
</span><span class="cx"> RefPtr<WebKitCSSFilterValue> filterValue;
</span><span class="cx">
</span><span class="lines">@@ -1092,10 +1092,10 @@
</span><span class="cx"> filterValue = WebKitCSSFilterValue::create(WebKitCSSFilterValue::UnknownFilterOperation);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- list->append(filterValue.release());
</del><ins>+ list.get().append(filterValue.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return list.release();
</del><ins>+ return std::move(list);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h (160540 => 160541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h        2013-12-13 10:24:37 UTC (rev 160540)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h        2013-12-13 10:32:05 UTC (rev 160541)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> bool propertyMatches(CSSPropertyID, const CSSValue*) const;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><del>- static PassRefPtr<CSSValue> valueForFilter(const RenderObject*, const RenderStyle*, const FilterOperations&, AdjustPixelValuesForComputedStyle = AdjustPixelValues);
</del><ins>+ static PassRef<CSSValue> valueForFilter(const RenderObject*, const RenderStyle*, const FilterOperations&, AdjustPixelValuesForComputedStyle = AdjustPixelValues);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFilterImageValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFilterImageValue.h (160540 => 160541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFilterImageValue.h        2013-12-13 10:24:37 UTC (rev 160540)
+++ trunk/Source/WebCore/css/CSSFilterImageValue.h        2013-12-13 10:32:05 UTC (rev 160541)
</span><span class="lines">@@ -48,9 +48,9 @@
</span><span class="cx"> class CSSFilterImageValue : public CSSImageGeneratorValue {
</span><span class="cx"> friend class FilterSubimageObserverProxy;
</span><span class="cx"> public:
</span><del>- static PassRef<CSSFilterImageValue> create(PassRefPtr<CSSValue> imageValue, PassRefPtr<CSSValue> filterValue)
</del><ins>+ static PassRef<CSSFilterImageValue> create(PassRef<CSSValue> imageValue, PassRef<CSSValue> filterValue)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new CSSFilterImageValue(imageValue, filterValue));
</del><ins>+ return adoptRef(*new CSSFilterImageValue(std::move(imageValue), std::move(filterValue)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ~CSSFilterImageValue();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (160540 => 160541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp        2013-12-13 10:24:37 UTC (rev 160540)
+++ trunk/Source/WebCore/css/CSSParser.cpp        2013-12-13 10:32:05 UTC (rev 160541)
</span><span class="lines">@@ -8529,7 +8529,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> value = args->next();
</span><span class="cx">
</span><del>- result = CSSFilterImageValue::create(imageValue, filterValue);
</del><ins>+ result = CSSFilterImageValue::create(imageValue.releaseNonNull(), filterValue.releaseNonNull());
</ins><span class="cx">
</span><span class="cx"> filter = result;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (160540 => 160541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp        2013-12-13 10:24:37 UTC (rev 160540)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp        2013-12-13 10:32:05 UTC (rev 160541)
</span><span class="lines">@@ -217,11 +217,11 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<StyleCachedImage> styledImage = StyleCachedImage::create(image);
</span><span class="cx"> auto imageValue = CSSImageValue::create(image->url(), styledImage.get());
</span><del>- RefPtr<CSSValue> filterValue = ComputedStyleExtractor::valueForFilter(anim->renderer(), &anim->renderer()->style(), filterResult, DoNotAdjustPixelValues);
- RefPtr<CSSFilterImageValue> result = CSSFilterImageValue::create(std::move(imageValue), filterValue);
- result->setFilterOperations(filterResult);
</del><ins>+ auto filterValue = ComputedStyleExtractor::valueForFilter(anim->renderer(), &anim->renderer()->style(), filterResult, DoNotAdjustPixelValues);
</ins><span class="cx">
</span><del>- return StyleGeneratedImage::create(*result);
</del><ins>+ auto result = CSSFilterImageValue::create(std::move(imageValue), std::move(filterValue));
+ result.get().setFilterOperations(filterResult);
+ return StyleGeneratedImage::create(std::move(result));
</ins><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(CSS_FILTERS)
</span><span class="cx">
</span><span class="lines">@@ -284,11 +284,10 @@
</span><span class="cx">
</span><span class="cx"> auto fromImageValue = CSSImageValue::create(fromStyleImage->cachedImage()->url(), fromStyleImage);
</span><span class="cx"> auto toImageValue = CSSImageValue::create(toStyleImage->cachedImage()->url(), toStyleImage);
</span><del>- RefPtr<CSSCrossfadeValue> crossfadeValue = CSSCrossfadeValue::create(std::move(fromImageValue), std::move(toImageValue));
</del><span class="cx">
</span><del>- crossfadeValue->setPercentage(CSSPrimitiveValue::create(progress, CSSPrimitiveValue::CSS_NUMBER));
-
- return StyleGeneratedImage::create(*crossfadeValue);
</del><ins>+ auto crossfadeValue = CSSCrossfadeValue::create(std::move(fromImageValue), std::move(toImageValue));
+ crossfadeValue.get().setPercentage(CSSPrimitiveValue::create(progress, CSSPrimitiveValue::CSS_NUMBER));
+ return StyleGeneratedImage::create(std::move(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></pre>
</div>
</div>
</body>
</html>