<!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>[169206] branches/safari-537.77-branch</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/169206">169206</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-05-22 10:09:59 -0700 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/164950">r164950</a>. <rdar://problem/16975484></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53777branchLayoutTestsChangeLog">branches/safari-537.77-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53777branchSourceWebCoreChangeLog">branches/safari-537.77-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53777branchSourceWebCoreplatformgraphicscamacPlatformCAFiltersMacmm">branches/safari-537.77-branch/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm</a></li>
<li><a href="#branchessafari53777branchSourceWebCoreplatformgraphicsfiltersFilterOperationcpp">branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.cpp</a></li>
<li><a href="#branchessafari53777branchSourceWebCoreplatformgraphicsfiltersFilterOperationh">branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53777branchLayoutTestscss3filtersanimationfrominitialvalueswithcolormatrixexpectedhtml">branches/safari-537.77-branch/LayoutTests/css3/filters/animation-from-initial-values-with-color-matrix-expected.html</a></li>
<li><a href="#branchessafari53777branchLayoutTestscss3filtersanimationfrominitialvalueswithcolormatrixhtml">branches/safari-537.77-branch/LayoutTests/css3/filters/animation-from-initial-values-with-color-matrix.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53777branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/LayoutTests/ChangeLog (169205 => 169206)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/LayoutTests/ChangeLog 2014-05-22 17:00:31 UTC (rev 169205)
+++ branches/safari-537.77-branch/LayoutTests/ChangeLog 2014-05-22 17:09:59 UTC (rev 169206)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-05-22 Lucas Forschler <lforschler@apple.com>
+
+ Merge r164950
+
+ 2014-03-02 Dean Jackson <dino@apple.com>
+
+ Add protected casting to FilterOperation classes.
+ https://bugs.webkit.org/show_bug.cgi?id=124062
+
+ Reviewed by Sam Weinig.
+
+ * css3/filters/animation-from-initial-values-with-color-matrix-expected.html: Added.
+ * css3/filters/animation-from-initial-values-with-color-matrix.html: Added.
+
</ins><span class="cx"> 2014-05-19 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r169098
</span></span></pre></div>
<a id="branchessafari53777branchLayoutTestscss3filtersanimationfrominitialvalueswithcolormatrixexpectedhtmlfromrev164950trunkLayoutTestscss3filtersanimationfrominitialvalueswithcolormatrixexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.77-branch/LayoutTests/css3/filters/animation-from-initial-values-with-color-matrix-expected.html (from rev 164950, trunk/LayoutTests/css3/filters/animation-from-initial-values-with-color-matrix-expected.html) (0 => 169206)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/LayoutTests/css3/filters/animation-from-initial-values-with-color-matrix-expected.html (rev 0)
+++ branches/safari-537.77-branch/LayoutTests/css3/filters/animation-from-initial-values-with-color-matrix-expected.html 2014-05-22 17:09:59 UTC (rev 169206)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<style>
+.anim {
+ position: relative;
+ width: 10px;
+ height: 10px;
+}
+</style>
+<div class="anim"></div>
+<div class="anim"></div>
+<div class="anim"></div>
+<div class="anim"></div>
+<div id="results">animation 4 finished<br>animation 3 finished<br>animation 2 finished<br>animation 1 finished<br></div>
</ins></span></pre></div>
<a id="branchessafari53777branchLayoutTestscss3filtersanimationfrominitialvalueswithcolormatrixhtmlfromrev164950trunkLayoutTestscss3filtersanimationfrominitialvalueswithcolormatrixhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.77-branch/LayoutTests/css3/filters/animation-from-initial-values-with-color-matrix.html (from rev 164950, trunk/LayoutTests/css3/filters/animation-from-initial-values-with-color-matrix.html) (0 => 169206)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/LayoutTests/css3/filters/animation-from-initial-values-with-color-matrix.html (rev 0)
+++ branches/safari-537.77-branch/LayoutTests/css3/filters/animation-from-initial-values-with-color-matrix.html 2014-05-22 17:09:59 UTC (rev 169206)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<script>
+if (window.testRunner)
+ window.testRunner.waitUntilDone();
+
+var numExpectedAnimations = 4;
+
+document.addEventListener("webkitAnimationEnd", function () {
+ var r = document.getElementById("results");
+ r.innerHTML += "animation " + numExpectedAnimations + " finished<br>";
+ numExpectedAnimations--;
+ if (!numExpectedAnimations && window.testRunner)
+ window.testRunner.notifyDone();
+}, false);
+</script>
+<style>
+@-webkit-keyframes a {
+ from {}
+ to {
+ -webkit-filter: invert(0.9);
+ }
+}
+
+@-webkit-keyframes b {
+ from {}
+ to {
+ -webkit-filter: opacity(0.9);
+ }
+}
+
+@-webkit-keyframes c {
+ from {}
+ to {
+ -webkit-filter: sepia(0.9);
+ }
+}
+
+@-webkit-keyframes d {
+ from {}
+ to {
+ -webkit-filter: grayscale(0.9);
+ }
+}
+
+.anim {
+ position: relative;
+ width: 10px;
+ height: 10px;
+ -webkit-transform: translate3d(0, 0, 0);
+ -webkit-animation-duration: 0.1s;
+}
+</style>
+<div class="anim" style="-webkit-animation-name: a;"></div>
+<div class="anim" style="-webkit-animation-name: b;"></div>
+<div class="anim" style="-webkit-animation-name: c;"></div>
+<div class="anim" style="-webkit-animation-name: d;"></div>
+<div id="results"></div>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/ChangeLog (169205 => 169206)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/ChangeLog 2014-05-22 17:00:31 UTC (rev 169205)
+++ branches/safari-537.77-branch/Source/WebCore/ChangeLog 2014-05-22 17:09:59 UTC (rev 169206)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2014-05-22 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r164950
+
+ 2014-03-02 Dean Jackson <dino@apple.com>
+
+ Add protected casting to FilterOperation classes.
+ https://bugs.webkit.org/show_bug.cgi?id=124062
+
+ Reviewed by Sam Weinig.
+
+ Use the type cast macro generators to produce some toFilterOperation-style
+ functions, and then use them in our PlatformCA filter code.
+
+ Test: css3/filters/animation-from-initial-values-with-color-matrix.html
+
+ * platform/graphics/ca/mac/PlatformCAFiltersMac.mm: Use the toFilterOperation methods, in
+ some cases removing the unnecessary double cast.
+ (PlatformCAFilters::filterValueForOperation):
+ (PlatformCAFilters::colorMatrixValueForFilter):
+ * platform/graphics/filters/FilterOperation.cpp:
+ (WebCore::BasicColorMatrixFilterOperation::blend):
+ (WebCore::BasicColorMatrixFilterOperation::operator==): Move this to the .cpp file so it can use the casting methods.
+ (WebCore::BasicComponentTransferFilterOperation::blend):
+ (WebCore::BasicComponentTransferFilterOperation::operator==): Ditto.
+ * platform/graphics/filters/FilterOperation.h: Add the casting macros.
+
+2014-05-22 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r157816
</span><span class="cx">
</span><span class="cx"> 2013-10-22 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebCoreplatformgraphicscamacPlatformCAFiltersMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm (169205 => 169206)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm 2014-05-22 17:00:31 UTC (rev 169205)
+++ branches/safari-537.77-branch/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm 2014-05-22 17:09:59 UTC (rev 169206)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> case FilterOperation::DROP_SHADOW: {
</span><span class="cx"> // FIXME: For now assume drop shadow is the last filter, put it on the layer.
</span><span class="cx"> // <rdar://problem/10959969> Handle case where drop-shadow is not the last filter.
</span><del>- const DropShadowFilterOperation* op = static_cast<const DropShadowFilterOperation*>(filterOperation);
</del><ins>+ const DropShadowFilterOperation* op = toDropShadowFilterOperation(filterOperation);
</ins><span class="cx"> [layer setShadowOffset:CGSizeMake(op->x(), op->y())];
</span><span class="cx">
</span><span class="cx"> CGFloat components[4];
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> }
</span><span class="cx"> #if USE_CA_FILTERS
</span><span class="cx"> case FilterOperation::GRAYSCALE: {
</span><del>- const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(filterOperation);
</del><ins>+ const BasicColorMatrixFilterOperation* op = toBasicColorMatrixFilterOperation(filterOperation);
</ins><span class="cx"> CAFilter *filter = [CAFilter filterWithType:kCAFilterColorMonochrome];
</span><span class="cx"> [filter setValue:[NSNumber numberWithFloat:op->amount()] forKey:@"inputAmount"];
</span><span class="cx"> [filter setName:filterName];
</span><span class="lines">@@ -133,8 +133,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::SEPIA: {
</span><del>- const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(filterOperation);
- RetainPtr<NSValue> colorMatrixValue = PlatformCAFilters::colorMatrixValueForFilter(*op);
</del><ins>+ RetainPtr<NSValue> colorMatrixValue = PlatformCAFilters::colorMatrixValueForFilter(*filterOperation);
</ins><span class="cx"> CAFilter *filter = [CAFilter filterWithType:kCAFilterColorMatrix];
</span><span class="cx"> [filter setValue:colorMatrixValue.get() forKey:@"inputColorMatrix"];
</span><span class="cx"> [filter setName:filterName];
</span><span class="lines">@@ -142,7 +141,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::SATURATE: {
</span><del>- const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(filterOperation);
</del><ins>+ const BasicColorMatrixFilterOperation* op = toBasicColorMatrixFilterOperation(filterOperation);
</ins><span class="cx"> CAFilter *filter = [CAFilter filterWithType:kCAFilterColorSaturate];
</span><span class="cx"> [filter setValue:[NSNumber numberWithFloat:op->amount()] forKey:@"inputAmount"];
</span><span class="cx"> [filter setName:filterName];
</span><span class="lines">@@ -150,7 +149,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::HUE_ROTATE: {
</span><del>- const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(filterOperation);
</del><ins>+ const BasicColorMatrixFilterOperation* op = toBasicColorMatrixFilterOperation(filterOperation);
</ins><span class="cx"> CAFilter *filter = [CAFilter filterWithType:kCAFilterColorHueRotate];
</span><span class="cx"> [filter setValue:[NSNumber numberWithFloat:deg2rad(op->amount())] forKey:@"inputAngle"];
</span><span class="cx"> [filter setName:@"hueRotate"];
</span><span class="lines">@@ -159,8 +158,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::INVERT: {
</span><del>- const BasicComponentTransferFilterOperation* op = static_cast<const BasicComponentTransferFilterOperation*>(filterOperation);
- RetainPtr<NSValue> colorMatrixValue = PlatformCAFilters::colorMatrixValueForFilter(*op);
</del><ins>+ RetainPtr<NSValue> colorMatrixValue = PlatformCAFilters::colorMatrixValueForFilter(*filterOperation);
</ins><span class="cx"> CAFilter *filter = [CAFilter filterWithType:kCAFilterColorMatrix];
</span><span class="cx"> [filter setValue:colorMatrixValue.get() forKey:@"inputColorMatrix"];
</span><span class="cx"> [filter setName:filterName];
</span><span class="lines">@@ -168,8 +166,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::OPACITY: {
</span><del>- const BasicComponentTransferFilterOperation* op = static_cast<const BasicComponentTransferFilterOperation*>(filterOperation);
- RetainPtr<NSValue> colorMatrixValue = PlatformCAFilters::colorMatrixValueForFilter(*op);
</del><ins>+ RetainPtr<NSValue> colorMatrixValue = PlatformCAFilters::colorMatrixValueForFilter(*filterOperation);
</ins><span class="cx"> CAFilter *filter = [CAFilter filterWithType:kCAFilterColorMatrix];
</span><span class="cx"> [filter setValue:colorMatrixValue.get() forKey:@"inputColorMatrix"];
</span><span class="cx"> [filter setName:filterName];
</span><span class="lines">@@ -177,8 +174,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::BRIGHTNESS: {
</span><del>- const BasicComponentTransferFilterOperation* op = static_cast<const BasicComponentTransferFilterOperation*>(filterOperation);
- RetainPtr<NSValue> colorMatrixValue = PlatformCAFilters::colorMatrixValueForFilter(*op);
</del><ins>+ RetainPtr<NSValue> colorMatrixValue = PlatformCAFilters::colorMatrixValueForFilter(*filterOperation);
</ins><span class="cx"> CAFilter *filter = [CAFilter filterWithType:kCAFilterColorMatrix];
</span><span class="cx"> [filter setValue:colorMatrixValue.get() forKey:@"inputColorMatrix"];
</span><span class="cx"> [filter setName:filterName];
</span><span class="lines">@@ -186,8 +182,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::CONTRAST: {
</span><del>- const BasicComponentTransferFilterOperation* op = static_cast<const BasicComponentTransferFilterOperation*>(filterOperation);
- RetainPtr<NSValue> colorMatrixValue = PlatformCAFilters::colorMatrixValueForFilter(*op);
</del><ins>+ RetainPtr<NSValue> colorMatrixValue = PlatformCAFilters::colorMatrixValueForFilter(*filterOperation);
</ins><span class="cx"> CAFilter *filter = [CAFilter filterWithType:kCAFilterColorMatrix];
</span><span class="cx"> [filter setValue:colorMatrixValue.get() forKey:@"inputColorMatrix"];
</span><span class="cx"> [filter setName:filterName];
</span><span class="lines">@@ -195,7 +190,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::BLUR: {
</span><del>- const BlurFilterOperation* op = static_cast<const BlurFilterOperation*>(filterOperation);
</del><ins>+ const BlurFilterOperation* op = toBlurFilterOperation(filterOperation);
</ins><span class="cx"> CAFilter *filter = [CAFilter filterWithType:kCAFilterGaussianBlur];
</span><span class="cx"> [filter setValue:[NSNumber numberWithFloat:floatValueForLength(op->stdDeviation(), 0)] forKey:@"inputRadius"];
</span><span class="cx"> [filter setName:filterName];
</span><span class="lines">@@ -204,7 +199,7 @@
</span><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> case FilterOperation::GRAYSCALE: {
</span><del>- const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(filterOperation);
</del><ins>+ const BasicColorMatrixFilterOperation* op = toBasicColorMatrixFilterOperation(filterOperation);
</ins><span class="cx"> CIFilter* filter = [CIFilter filterWithName:@"CIColorMonochrome"];
</span><span class="cx"> [filter setDefaults];
</span><span class="cx"> [filter setValue:[NSNumber numberWithFloat:op->amount()] forKey:@"inputIntensity"];
</span><span class="lines">@@ -214,7 +209,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::SEPIA: {
</span><del>- const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(filterOperation);
</del><ins>+ const BasicColorMatrixFilterOperation* op = toBasicColorMatrixFilterOperation(filterOperation);
</ins><span class="cx"> CIFilter* filter = [CIFilter filterWithName:@"CIColorMatrix"];
</span><span class="cx"> [filter setDefaults];
</span><span class="cx">
</span><span class="lines">@@ -235,7 +230,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::SATURATE: {
</span><del>- const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(filterOperation);
</del><ins>+ const BasicColorMatrixFilterOperation* op = toBasicColorMatrixFilterOperation(filterOperation);
</ins><span class="cx"> CIFilter* filter = [CIFilter filterWithName:@"CIColorControls"];
</span><span class="cx"> [filter setDefaults];
</span><span class="cx"> [filter setValue:[NSNumber numberWithFloat:op->amount()] forKey:@"inputSaturation"];
</span><span class="lines">@@ -244,7 +239,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::HUE_ROTATE: {
</span><del>- const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(filterOperation);
</del><ins>+ const BasicColorMatrixFilterOperation* op = toBasicColorMatrixFilterOperation(filterOperation);
</ins><span class="cx"> CIFilter* filter = [CIFilter filterWithName:@"CIHueAdjust"];
</span><span class="cx"> [filter setDefaults];
</span><span class="cx">
</span><span class="lines">@@ -254,7 +249,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::INVERT: {
</span><del>- const BasicComponentTransferFilterOperation* op = static_cast<const BasicComponentTransferFilterOperation*>(filterOperation);
</del><ins>+ const BasicComponentTransferFilterOperation* op = toBasicComponentTransferFilterOperation(filterOperation);
</ins><span class="cx"> CIFilter* filter = [CIFilter filterWithName:@"CIColorMatrix"];
</span><span class="cx"> [filter setDefaults];
</span><span class="cx">
</span><span class="lines">@@ -271,7 +266,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::OPACITY: {
</span><del>- const BasicComponentTransferFilterOperation* op = static_cast<const BasicComponentTransferFilterOperation*>(filterOperation);
</del><ins>+ const BasicComponentTransferFilterOperation* op = toBasicComponentTransferFilterOperation(filterOperation);
</ins><span class="cx"> CIFilter* filter = [CIFilter filterWithName:@"CIColorMatrix"];
</span><span class="cx"> [filter setDefaults];
</span><span class="cx">
</span><span class="lines">@@ -285,7 +280,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::BRIGHTNESS: {
</span><del>- const BasicComponentTransferFilterOperation* op = static_cast<const BasicComponentTransferFilterOperation*>(filterOperation);
</del><ins>+ const BasicComponentTransferFilterOperation* op = toBasicComponentTransferFilterOperation(filterOperation);
</ins><span class="cx"> CIFilter* filter = [CIFilter filterWithName:@"CIColorMatrix"];
</span><span class="cx"> [filter setDefaults];
</span><span class="cx"> double amount = op->amount();
</span><span class="lines">@@ -298,7 +293,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::CONTRAST: {
</span><del>- const BasicComponentTransferFilterOperation* op = static_cast<const BasicComponentTransferFilterOperation*>(filterOperation);
</del><ins>+ const BasicComponentTransferFilterOperation* op = toBasicComponentTransferFilterOperation(filterOperation);
</ins><span class="cx"> CIFilter* filter = [CIFilter filterWithName:@"CIColorControls"];
</span><span class="cx"> [filter setDefaults];
</span><span class="cx"> [filter setValue:[NSNumber numberWithFloat:op->amount()] forKey:@"inputContrast"];
</span><span class="lines">@@ -308,7 +303,7 @@
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::BLUR: {
</span><span class="cx"> // FIXME: For now we ignore stdDeviationY.
</span><del>- const BlurFilterOperation* op = static_cast<const BlurFilterOperation*>(filterOperation);
</del><ins>+ const BlurFilterOperation* op = toBlurFilterOperation(filterOperation);
</ins><span class="cx"> CIFilter* filter = [CIFilter filterWithName:@"CIGaussianBlur"];
</span><span class="cx"> [filter setDefaults];
</span><span class="cx"> [filter setValue:[NSNumber numberWithFloat:floatValueForLength(op->stdDeviation(), 0)] forKey:@"inputRadius"];
</span><span class="lines">@@ -345,7 +340,7 @@
</span><span class="cx"> // CAFilter: inputAmount
</span><span class="cx"> double amount = 0;
</span><span class="cx"> if (!operation->isDefault()) {
</span><del>- const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(operation);
</del><ins>+ const BasicColorMatrixFilterOperation* op = toBasicColorMatrixFilterOperation(operation);
</ins><span class="cx"> amount = op->amount();
</span><span class="cx"> }
</span><span class="cx"> value = [NSNumber numberWithDouble:amount];
</span><span class="lines">@@ -354,13 +349,12 @@
</span><span class="cx"> case FilterOperation::SEPIA: {
</span><span class="cx"> #if USE_CA_FILTERS
</span><span class="cx"> // CAFilter: inputColorMatrix
</span><del>- const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(operation);
- value = PlatformCAFilters::colorMatrixValueForFilter(*op);
</del><ins>+ value = PlatformCAFilters::colorMatrixValueForFilter(*operation);
</ins><span class="cx"> #else
</span><span class="cx"> // CIFilter: inputRVector, inputGVector, inputBVector
</span><span class="cx"> double amount = 0;
</span><span class="cx"> if (!operation->isDefault()) {
</span><del>- const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(operation);
</del><ins>+ const BasicColorMatrixFilterOperation* op = toBasicColorMatrixFilterOperation(operation);
</ins><span class="cx"> amount = op->amount();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -385,7 +379,7 @@
</span><span class="cx"> // CAFilter: inputAmount
</span><span class="cx"> double amount = 1;
</span><span class="cx"> if (!operation->isDefault()) {
</span><del>- const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(operation);
</del><ins>+ const BasicColorMatrixFilterOperation* op = toBasicColorMatrixFilterOperation(operation);
</ins><span class="cx"> amount = op->amount();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -397,7 +391,7 @@
</span><span class="cx"> // Hue rotate CAFilter: inputAngle
</span><span class="cx"> double amount = 0;
</span><span class="cx"> if (!operation->isDefault()) {
</span><del>- const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(operation);
</del><ins>+ const BasicColorMatrixFilterOperation* op = toBasicColorMatrixFilterOperation(operation);
</ins><span class="cx"> amount = op->amount();
</span><span class="cx"> }
</span><span class="cx"> amount = deg2rad(amount);
</span><span class="lines">@@ -407,13 +401,12 @@
</span><span class="cx"> case FilterOperation::INVERT: {
</span><span class="cx"> #if USE_CA_FILTERS
</span><span class="cx"> // CAFilter: inputColorMatrix
</span><del>- const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(operation);
- value = PlatformCAFilters::colorMatrixValueForFilter(*op);
</del><ins>+ value = PlatformCAFilters::colorMatrixValueForFilter(*operation);
</ins><span class="cx"> #else
</span><span class="cx"> // CIFilter: inputRVector, inputGVector, inputBVector, inputBiasVector
</span><span class="cx"> double amount = 0;
</span><span class="cx"> if (!operation->isDefault()) {
</span><del>- const BasicComponentTransferFilterOperation* op = static_cast<const BasicComponentTransferFilterOperation*>(operation);
</del><ins>+ const BasicComponentTransferFilterOperation* op = toBasicComponentTransferFilterOperation(operation);
</ins><span class="cx"> amount = op->amount();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -436,13 +429,12 @@
</span><span class="cx"> case FilterOperation::OPACITY: {
</span><span class="cx"> #if USE_CA_FILTERS
</span><span class="cx"> // Opacity CAFilter: inputColorMatrix
</span><del>- const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(operation);
- value = PlatformCAFilters::colorMatrixValueForFilter(*op);
</del><ins>+ value = PlatformCAFilters::colorMatrixValueForFilter(*operation);
</ins><span class="cx"> #else
</span><span class="cx"> // Opacity CIFilter: inputAVector
</span><span class="cx"> double amount = 1;
</span><span class="cx"> if (!operation->isDefault()) {
</span><del>- const BasicComponentTransferFilterOperation* op = static_cast<const BasicComponentTransferFilterOperation*>(operation);
</del><ins>+ const BasicComponentTransferFilterOperation* op = toBasicComponentTransferFilterOperation(operation);
</ins><span class="cx"> amount = op->amount();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -454,13 +446,12 @@
</span><span class="cx"> case FilterOperation::BRIGHTNESS: {
</span><span class="cx"> #if USE_CA_FILTERS
</span><span class="cx"> // Brightness CAFilter: inputColorMatrix
</span><del>- const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(operation);
- value = PlatformCAFilters::colorMatrixValueForFilter(*op);
</del><ins>+ value = PlatformCAFilters::colorMatrixValueForFilter(*operation);
</ins><span class="cx"> #else
</span><span class="cx"> // Brightness CIFilter: inputColorMatrix
</span><span class="cx"> double amount = 1;
</span><span class="cx"> if (!operation->isDefault()) {
</span><del>- const BasicComponentTransferFilterOperation* op = static_cast<const BasicComponentTransferFilterOperation*>(operation);
</del><ins>+ const BasicComponentTransferFilterOperation* op = toBasicComponentTransferFilterOperation(operation);
</ins><span class="cx"> amount = op->amount();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -478,13 +469,12 @@
</span><span class="cx"> case FilterOperation::CONTRAST: {
</span><span class="cx"> #if USE_CA_FILTERS
</span><span class="cx"> // Contrast CAFilter: inputColorMatrix
</span><del>- const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(operation);
- value = PlatformCAFilters::colorMatrixValueForFilter(*op);
</del><ins>+ value = PlatformCAFilters::colorMatrixValueForFilter(*operation);
</ins><span class="cx"> #else
</span><span class="cx"> // Contrast CIFilter: inputContrast
</span><span class="cx"> double amount = 1;
</span><span class="cx"> if (!operation->isDefault()) {
</span><del>- const BasicComponentTransferFilterOperation* op = static_cast<const BasicComponentTransferFilterOperation*>(operation);
</del><ins>+ const BasicComponentTransferFilterOperation* op = toBasicComponentTransferFilterOperation(operation);
</ins><span class="cx"> amount = op->amount();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -498,7 +488,7 @@
</span><span class="cx"> double amount = 0;
</span><span class="cx">
</span><span class="cx"> if (!operation->isDefault()) {
</span><del>- const BlurFilterOperation* op = static_cast<const BlurFilterOperation*>(operation);
</del><ins>+ const BlurFilterOperation* op = toBlurFilterOperation(operation);
</ins><span class="cx"> amount = floatValueForLength(op->stdDeviation(), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -517,7 +507,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch (filterOperation.getOperationType()) {
</span><span class="cx"> case FilterOperation::SEPIA: {
</span><del>- const BasicColorMatrixFilterOperation& op = static_cast<const BasicColorMatrixFilterOperation&>(filterOperation);
</del><ins>+ const BasicColorMatrixFilterOperation& op = toBasicColorMatrixFilterOperation(filterOperation);
</ins><span class="cx"> double t = op.amount();
</span><span class="cx"> t = std::min(std::max(0.0, t), 1.0);
</span><span class="cx"> CAColorMatrix colorMatrix = {
</span><span class="lines">@@ -537,7 +527,7 @@
</span><span class="cx"> return [NSValue valueWithCAColorMatrix:colorMatrix];
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::INVERT: {
</span><del>- const BasicComponentTransferFilterOperation& op = static_cast<const BasicComponentTransferFilterOperation&>(filterOperation);
</del><ins>+ const BasicComponentTransferFilterOperation& op = toBasicComponentTransferFilterOperation(filterOperation);
</ins><span class="cx"> float amount = op.amount();
</span><span class="cx"> if (op.isDefault())
</span><span class="cx"> amount = 0;
</span><span class="lines">@@ -552,7 +542,7 @@
</span><span class="cx"> return [NSValue valueWithCAColorMatrix:colorMatrix];
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::OPACITY: {
</span><del>- const BasicComponentTransferFilterOperation& op = static_cast<const BasicComponentTransferFilterOperation&>(filterOperation);
</del><ins>+ const BasicComponentTransferFilterOperation& op = toBasicComponentTransferFilterOperation(filterOperation);
</ins><span class="cx"> float amount = op.amount();
</span><span class="cx"> if (op.isDefault())
</span><span class="cx"> amount = 1;
</span><span class="lines">@@ -566,7 +556,7 @@
</span><span class="cx"> return [NSValue valueWithCAColorMatrix:colorMatrix];
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::CONTRAST: {
</span><del>- const BasicComponentTransferFilterOperation& op = static_cast<const BasicComponentTransferFilterOperation&>(filterOperation);
</del><ins>+ const BasicComponentTransferFilterOperation& op = toBasicComponentTransferFilterOperation(filterOperation);
</ins><span class="cx"> float amount = op.amount();
</span><span class="cx"> if (op.isDefault())
</span><span class="cx"> amount = 1;
</span><span class="lines">@@ -581,7 +571,7 @@
</span><span class="cx"> return [NSValue valueWithCAColorMatrix:colorMatrix];
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::BRIGHTNESS: {
</span><del>- const BasicComponentTransferFilterOperation& op = static_cast<const BasicComponentTransferFilterOperation&>(filterOperation);
</del><ins>+ const BasicComponentTransferFilterOperation& op = toBasicComponentTransferFilterOperation(filterOperation);
</ins><span class="cx"> float amount = op.amount();
</span><span class="cx"> if (op.isDefault())
</span><span class="cx"> amount = 1;
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebCoreplatformgraphicsfiltersFilterOperationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.cpp (169205 => 169206)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.cpp 2014-05-22 17:00:31 UTC (rev 169205)
+++ branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.cpp 2014-05-22 17:09:59 UTC (rev 169206)
</span><span class="lines">@@ -62,11 +62,19 @@
</span><span class="cx"> if (blendToPassthrough)
</span><span class="cx"> return BasicColorMatrixFilterOperation::create(WebCore::blend(m_amount, passthroughAmount(), progress), m_type);
</span><span class="cx">
</span><del>- const BasicColorMatrixFilterOperation* fromOp = static_cast<const BasicColorMatrixFilterOperation*>(from);
</del><ins>+ const BasicColorMatrixFilterOperation* fromOp = toBasicColorMatrixFilterOperation(from);
</ins><span class="cx"> double fromAmount = fromOp ? fromOp->amount() : passthroughAmount();
</span><span class="cx"> return BasicColorMatrixFilterOperation::create(WebCore::blend(fromAmount, m_amount, progress), m_type);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool BasicColorMatrixFilterOperation::operator==(const FilterOperation& o) const
+{
+ if (!isSameType(o))
+ return false;
+ const BasicColorMatrixFilterOperation& other = toBasicColorMatrixFilterOperation(o);
+ return m_amount == other.m_amount;
+}
+
</ins><span class="cx"> double BasicColorMatrixFilterOperation::passthroughAmount() const
</span><span class="cx"> {
</span><span class="cx"> switch (m_type) {
</span><span class="lines">@@ -90,11 +98,19 @@
</span><span class="cx"> if (blendToPassthrough)
</span><span class="cx"> return BasicComponentTransferFilterOperation::create(WebCore::blend(m_amount, passthroughAmount(), progress), m_type);
</span><span class="cx">
</span><del>- const BasicComponentTransferFilterOperation* fromOp = static_cast<const BasicComponentTransferFilterOperation*>(from);
</del><ins>+ const BasicComponentTransferFilterOperation* fromOp = toBasicComponentTransferFilterOperation(from);
</ins><span class="cx"> double fromAmount = fromOp ? fromOp->amount() : passthroughAmount();
</span><span class="cx"> return BasicComponentTransferFilterOperation::create(WebCore::blend(fromAmount, m_amount, progress), m_type);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool BasicComponentTransferFilterOperation::operator==(const FilterOperation& o) const
+{
+ if (!isSameType(o))
+ return false;
+ const BasicComponentTransferFilterOperation& other = toBasicComponentTransferFilterOperation(o);
+ return m_amount == other.m_amount;
+}
+
</ins><span class="cx"> double BasicComponentTransferFilterOperation::passthroughAmount() const
</span><span class="cx"> {
</span><span class="cx"> switch (m_type) {
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebCoreplatformgraphicsfiltersFilterOperationh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.h (169205 => 169206)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.h 2014-05-22 17:00:31 UTC (rev 169205)
+++ branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.h 2014-05-22 17:09:59 UTC (rev 169206)
</span><span class="lines">@@ -215,16 +215,10 @@
</span><span class="cx"> virtual PassRefPtr<FilterOperation> blend(const FilterOperation* from, double progress, bool blendToPassthrough = false);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual bool operator==(const FilterOperation& o) const
- {
- if (!isSameType(o))
- return false;
- const BasicColorMatrixFilterOperation* other = static_cast<const BasicColorMatrixFilterOperation*>(&o);
- return m_amount == other->m_amount;
- }
-
</del><ins>+ virtual bool operator==(const FilterOperation&) const override;
+
</ins><span class="cx"> double passthroughAmount() const;
</span><del>-
</del><ins>+
</ins><span class="cx"> BasicColorMatrixFilterOperation(double amount, OperationType type)
</span><span class="cx"> : FilterOperation(type)
</span><span class="cx"> , m_amount(amount)
</span><span class="lines">@@ -249,13 +243,7 @@
</span><span class="cx"> virtual PassRefPtr<FilterOperation> blend(const FilterOperation* from, double progress, bool blendToPassthrough = false);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual bool operator==(const FilterOperation& o) const
- {
- if (!isSameType(o))
- return false;
- const BasicComponentTransferFilterOperation* other = static_cast<const BasicComponentTransferFilterOperation*>(&o);
- return m_amount == other->m_amount;
- }
</del><ins>+ virtual bool operator==(const FilterOperation&) const override;
</ins><span class="cx">
</span><span class="cx"> double passthroughAmount() const;
</span><span class="cx">
</span><span class="lines">@@ -341,6 +329,16 @@
</span><span class="cx"> Color m_color;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+#define SIMPLE_FILTER_OPERATION_CASTS(ToValueTypeName, predicate) \
+ TYPE_CASTS_BASE(ToValueTypeName, FilterOperation, operation, operation->type() == FilterOperation::predicate, operation.type() == FilterOperation::predicate)
+
+SIMPLE_FILTER_OPERATION_CASTS(ReferenceFilterOperation, REFERENCE)
+SIMPLE_FILTER_OPERATION_CASTS(BlurFilterOperation, BLUR)
+SIMPLE_FILTER_OPERATION_CASTS(DropShadowFilterOperation, DROP_SHADOW)
+
+TYPE_CASTS_BASE(BasicColorMatrixFilterOperation, FilterOperation, operation, operation->type() == FilterOperation::GRAYSCALE || operation->type() == FilterOperation::SEPIA || operation->type() == FilterOperation::SATURATE || operation->type() == FilterOperation::HUE_ROTATE, operation.type() == FilterOperation::GRAYSCALE || operation.type() == FilterOperation::SEPIA || operation.type() == FilterOperation::SATURATE || operation.type() == FilterOperation::HUE_ROTATE)
+TYPE_CASTS_BASE(BasicComponentTransferFilterOperation, FilterOperation, operation, operation->type() == FilterOperation::INVERT || operation->type() == FilterOperation::BRIGHTNESS || operation->type() == FilterOperation::CONTRAST || operation->type() == FilterOperation::OPACITY, operation.type() == FilterOperation::INVERT || operation.type() == FilterOperation::BRIGHTNESS || operation.type() == FilterOperation::CONTRAST || operation.type() == FilterOperation::OPACITY)
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(CSS_FILTERS)
</span></span></pre>
</div>
</div>
</body>
</html>