<!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>[178845] branches/safari-600.1.4.15-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/178845">178845</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-01-21 10:46:33 -0800 (Wed, 21 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/177000">r177000</a>. rdar://problem/19339033</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchPerformanceTestsChangeLog">branches/safari-600.1.4.15-branch/PerformanceTests/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWTFChangeLog">branches/safari-600.1.4.15-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWTFwtfPlatformh">branches/safari-600.1.4.15-branch/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformgraphicsfiltersFEGaussianBlurcpp">branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformgraphicsfiltersFEGaussianBlurh">branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/filters/FEGaussianBlur.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchPerformanceTestsInteractiveblurfiltertiminghtml">branches/safari-600.1.4.15-branch/PerformanceTests/Interactive/blur-filter-timing.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/PerformanceTests/ChangeLog (178844 => 178845)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/PerformanceTests/ChangeLog 2015-01-21 18:44:33 UTC (rev 178844)
+++ branches/safari-600.1.4.15-branch/PerformanceTests/ChangeLog 2015-01-21 18:46:33 UTC (rev 178845)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-01-21 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r177000.
+
+ 2014-12-08 Dean Jackson <dino@apple.com>
+
+ [Apple] Use Accelerate framework to speed-up FEGaussianBlur
+ https://bugs.webkit.org/show_bug.cgi?id=139310
+
+ Reviewed by Simon Fraser.
+
+ Add an interactive performance test that measures the speed of a set
+ of blur operations on a generated images.
+
+ * Interactive/blur-filter-timing.html: Added.
+
</ins><span class="cx"> 2014-06-02 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Rename DoYouEvenBench 0.17 to Speedometer 1.0 and add a new look.
</span></span></pre></div>
<a id="branchessafari6001415branchPerformanceTestsInteractiveblurfiltertiminghtmlfromrev177000trunkPerformanceTestsInteractiveblurfiltertiminghtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/PerformanceTests/Interactive/blur-filter-timing.html (from rev 177000, trunk/PerformanceTests/Interactive/blur-filter-timing.html) (0 => 178845)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/PerformanceTests/Interactive/blur-filter-timing.html (rev 0)
+++ branches/safari-600.1.4.15-branch/PerformanceTests/Interactive/blur-filter-timing.html 2015-01-21 18:46:33 UTC (rev 178845)
</span><span class="lines">@@ -0,0 +1,93 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>Timing test for blur filter</title>
+ <style>
+ img {
+ width: 600px;
+ height: 600px;
+ }
+ </style>
+ <script>
+
+ var WIDTH = 600;
+ var HEIGHT = 600;
+ var NUM_ITERATIONS = 10;
+ var MAX_RADIUS = 20;
+ var currentIteration = 0;
+ var currentRadius = 0;
+ var testIsRunning = false;
+ var image = null;
+ var startTime = null;
+
+ function init() {
+ document.querySelector("button").addEventListener("click", run, false);
+ image = document.querySelector("img");
+
+ // Fill the image with generated content. We can't use a canvas directly,
+ // since that gets composited.
+ var canvas = document.createElement("canvas");
+ canvas.width = WIDTH * window.devicePixelRatio;
+ canvas.height = HEIGHT * window.devicePixelRatio;
+
+ // Fill the canvas with some generated content.
+ var ctx = canvas.getContext("2d");
+ ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
+
+ for (var i = 0; i < WIDTH; i += 20) {
+ for (var j = 0; j < HEIGHT; j += 20) {
+ ctx.fillStyle = "rgb(" + Math.round(i / WIDTH * 255) + ", " + Math.round(j / HEIGHT * 255) + ", " + (i % 40 ? 64 : 192) + ")";
+ ctx.fillRect(i, j, 20, 20);
+ }
+ }
+
+ image.src = canvas.toDataURL();
+ }
+
+ function run() {
+ if (testIsRunning)
+ return;
+
+ testIsRunning = true;
+ currentIteration = 0;
+ currentRadius = 0;
+ startTime = Date.now();
+
+ step();
+ }
+
+ function step() {
+ var usedRadius = (currentIteration % 2) ? (MAX_RADIUS - currentRadius) : currentRadius;
+ image.style.webkitFilter = "blur(" + usedRadius + "px)";
+ currentRadius++;
+ if (currentRadius > MAX_RADIUS) {
+ currentIteration++;
+ currentRadius = 0;
+ }
+
+ if (currentIteration < NUM_ITERATIONS)
+ setTimeout(step, 0);
+ else
+ end();
+ }
+
+ function end() {
+ testIsRunning = false;
+ var elapsedTime = (Date.now() - startTime) / 1000;
+ var result = document.createElement("p");
+ result.textContent = (NUM_ITERATIONS * MAX_RADIUS) + " blurs done in " + elapsedTime + " seconds";
+ document.body.appendChild(result);
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+
+ window.addEventListener("load", init, false);
+ </script>
+</head>
+<body>
+<img>
+<p>
+ <button>Start</button>
+</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WTF/ChangeLog (178844 => 178845)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WTF/ChangeLog 2015-01-21 18:44:33 UTC (rev 178844)
+++ branches/safari-600.1.4.15-branch/Source/WTF/ChangeLog 2015-01-21 18:46:33 UTC (rev 178845)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-01-21 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r177000.
+
+ 2014-12-08 Dean Jackson <dino@apple.com>
+
+ [Apple] Use Accelerate framework to speed-up FEGaussianBlur
+ https://bugs.webkit.org/show_bug.cgi?id=139310
+ <rdar://problem/18434594>
+
+ Reviewed by Simon Fraser.
+
+ Add a HAVE_ACCELERATE flag, true on Apple platforms.
+
+ * wtf/Platform.h:
+
+2015-01-21 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r176982.
</span><span class="cx">
</span><span class="cx"> 2014-12-08 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WTF/wtf/Platform.h (178844 => 178845)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WTF/wtf/Platform.h 2015-01-21 18:44:33 UTC (rev 178844)
+++ branches/safari-600.1.4.15-branch/Source/WTF/wtf/Platform.h 2015-01-21 18:46:33 UTC (rev 178845)
</span><span class="lines">@@ -1054,4 +1054,8 @@
</span><span class="cx"> #define TARGET_OS_IPHONE 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+#define HAVE_ACCELERATE 1
+#endif
+
</ins><span class="cx"> #endif /* WTF_Platform_h */
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (178844 => 178845)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 18:44:33 UTC (rev 178844)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 18:46:33 UTC (rev 178845)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2015-01-21 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r177000.
+
+ 2014-12-08 Dean Jackson <dino@apple.com>
+
+ [Apple] Use Accelerate framework to speed-up FEGaussianBlur
+ https://bugs.webkit.org/show_bug.cgi?id=139310
+ <rdar://problem/18434594>
+
+ Reviewed by Simon Fraser.
+
+ Using Apple's Accelerate framework provides faster blurs
+ than the parallel jobs approach, especially since r168577
+ which started performing retina-accurate filters.
+
+ Using Accelerate.framework to replace the existing box blur (what
+ we use to approximate Gaussian blurs) gets about a 20% speedup on
+ desktop class machines, but between a 2x-6x speedup on iOS hardware.
+ Obviously this depends on the size of the content being blurred,
+ but it is still good.
+
+ The change is to intercept the platformApply function on
+ FEGaussianBlur and send it off to Accelerate.
+
+ There is an interactive performance test: PerformanceTests/Interactive/blur-filter-timing.html
+
+ * platform/graphics/filters/FEGaussianBlur.cpp:
+ (WebCore::kernelPosition): Move this to a file static function from the .h.
+ (WebCore::accelerateBoxBlur): The Accelerate implementation.
+ (WebCore::standardBoxBlur): The default generic/standard implementation.
+ (WebCore::FEGaussianBlur::platformApplyGeneric): Use accelerate or the default form.
+ (WebCore::FEGaussianBlur::platformApply): Don't try the parallelJobs approach if Accelerate is available.
+ * platform/graphics/filters/FEGaussianBlur.h:
+ (WebCore::FEGaussianBlur::kernelPosition): Deleted. Move into the .cpp.
+
+2015-01-21 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r176977.
</span><span class="cx">
</span><span class="cx"> 2014-12-08 Eric Carlson <eric.carlson@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformgraphicsfiltersFEGaussianBlurcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp (178844 => 178845)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp 2015-01-21 18:44:33 UTC (rev 178844)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp 2015-01-21 18:46:33 UTC (rev 178845)
</span><span class="lines">@@ -32,6 +32,10 @@
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "TextStream.h"
</span><span class="cx">
</span><ins>+#if HAVE(ACCELERATE)
+#include <Accelerate/Accelerate.h>
+#endif
+
</ins><span class="cx"> #include <runtime/JSCInlines.h>
</span><span class="cx"> #include <runtime/TypedArrayInlines.h>
</span><span class="cx"> #include <runtime/Uint8ClampedArray.h>
</span><span class="lines">@@ -47,6 +51,34 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+inline void kernelPosition(int blurIteration, unsigned& radius, int& deltaLeft, int& deltaRight)
+{
+ // Check http://www.w3.org/TR/SVG/filters.html#feGaussianBlurElement for details.
+ switch (blurIteration) {
+ case 0:
+ if (!(radius % 2)) {
+ deltaLeft = radius / 2 - 1;
+ deltaRight = radius - deltaLeft;
+ } else {
+ deltaLeft = radius / 2;
+ deltaRight = radius - deltaLeft;
+ }
+ break;
+ case 1:
+ if (!(radius % 2)) {
+ deltaLeft++;
+ deltaRight--;
+ }
+ break;
+ case 2:
+ if (!(radius % 2)) {
+ deltaRight++;
+ radius++;
+ }
+ break;
+ }
+}
+
</ins><span class="cx"> FEGaussianBlur::FEGaussianBlur(Filter* filter, float x, float y, EdgeModeType edgeMode)
</span><span class="cx"> : FilterEffect(filter)
</span><span class="cx"> , m_stdX(x)
</span><span class="lines">@@ -264,15 +296,51 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void FEGaussianBlur::platformApplyGeneric(Uint8ClampedArray* srcPixelArray, Uint8ClampedArray* tmpPixelArray, unsigned kernelSizeX, unsigned kernelSizeY, IntSize& paintSize)
</del><ins>+#if HAVE(ACCELERATE)
+inline void accelerateBoxBlur(const Uint8ClampedArray* src, Uint8ClampedArray* dst, unsigned kernelSize, int stride, int effectWidth, int effectHeight)
</ins><span class="cx"> {
</span><del>- int stride = 4 * paintSize.width();
</del><ins>+ // We must always use an odd radius.
+ if (kernelSize % 2 != 1)
+ kernelSize += 1;
+
+ vImage_Buffer effectInBuffer;
+ effectInBuffer.data = src->data();
+ effectInBuffer.width = effectWidth;
+ effectInBuffer.height = effectHeight;
+ effectInBuffer.rowBytes = stride;
+
+ vImage_Buffer effectOutBuffer;
+ effectOutBuffer.data = dst->data();
+ effectOutBuffer.width = effectWidth;
+ effectOutBuffer.height = effectHeight;
+ effectOutBuffer.rowBytes = stride;
+
+ // Determine the size of a temporary buffer by calling the function first with a special flag. vImage will return
+ // the size needed, or an error (which are all negative).
+ size_t tmpBufferSize = vImageBoxConvolve_ARGB8888(&effectInBuffer, &effectOutBuffer, 0, 0, 0, kernelSize, kernelSize, 0, kvImageEdgeExtend | kvImageGetTempBufferSize);
+ if (tmpBufferSize <= 0)
+ return;
+
+ void* tmpBuffer = fastMalloc(tmpBufferSize);
+ vImageBoxConvolve_ARGB8888(&effectInBuffer, &effectOutBuffer, tmpBuffer, 0, 0, kernelSize, kernelSize, 0, kvImageEdgeExtend);
+ vImageBoxConvolve_ARGB8888(&effectOutBuffer, &effectInBuffer, tmpBuffer, 0, 0, kernelSize, kernelSize, 0, kvImageEdgeExtend);
+ vImageBoxConvolve_ARGB8888(&effectInBuffer, &effectOutBuffer, tmpBuffer, 0, 0, kernelSize, kernelSize, 0, kvImageEdgeExtend);
+ WTF::fastFree(tmpBuffer);
+
+ // The final result should be stored in src.
+ if (dst == src) {
+ ASSERT(src->length() == dst->length());
+ memcpy(dst->data(), src->data(), src->length());
+ }
+}
+#endif
+
+inline void standardBoxBlur(Uint8ClampedArray* src, Uint8ClampedArray* dst, unsigned kernelSizeX, unsigned kernelSizeY, int stride, IntSize& paintSize, bool isAlphaImage, EdgeModeType edgeMode)
+{
</ins><span class="cx"> int dxLeft = 0;
</span><span class="cx"> int dxRight = 0;
</span><span class="cx"> int dyLeft = 0;
</span><span class="cx"> int dyRight = 0;
</span><del>- Uint8ClampedArray* src = srcPixelArray;
- Uint8ClampedArray* dst = tmpPixelArray;
</del><span class="cx">
</span><span class="cx"> for (int i = 0; i < 3; ++i) {
</span><span class="cx"> if (kernelSizeX) {
</span><span class="lines">@@ -281,9 +349,9 @@
</span><span class="cx"> if (!isAlphaImage())
</span><span class="cx"> boxBlurNEON(src, dst, kernelSizeX, dxLeft, dxRight, 4, stride, paintSize.width(), paintSize.height());
</span><span class="cx"> else
</span><del>- boxBlur(src, dst, kernelSizeX, dxLeft, dxRight, 4, stride, paintSize.width(), paintSize.height(), true, m_edgeMode);
</del><ins>+ boxBlur(src, dst, kernelSizeX, dxLeft, dxRight, 4, stride, paintSize.width(), paintSize.height(), true, edgeMode);
</ins><span class="cx"> #else
</span><del>- boxBlur(src, dst, kernelSizeX, dxLeft, dxRight, 4, stride, paintSize.width(), paintSize.height(), isAlphaImage(), m_edgeMode);
</del><ins>+ boxBlur(src, dst, kernelSizeX, dxLeft, dxRight, 4, stride, paintSize.width(), paintSize.height(), isAlphaImage, edgeMode);
</ins><span class="cx"> #endif
</span><span class="cx"> std::swap(src, dst);
</span><span class="cx"> }
</span><span class="lines">@@ -294,20 +362,33 @@
</span><span class="cx"> if (!isAlphaImage())
</span><span class="cx"> boxBlurNEON(src, dst, kernelSizeY, dyLeft, dyRight, stride, 4, paintSize.height(), paintSize.width());
</span><span class="cx"> else
</span><del>- boxBlur(src, dst, kernelSizeY, dyLeft, dyRight, stride, 4, paintSize.height(), paintSize.width(), true, m_edgeMode);
</del><ins>+ boxBlur(src, dst, kernelSizeY, dyLeft, dyRight, stride, 4, paintSize.height(), paintSize.width(), true, edgeMode);
</ins><span class="cx"> #else
</span><del>- boxBlur(src, dst, kernelSizeY, dyLeft, dyRight, stride, 4, paintSize.height(), paintSize.width(), isAlphaImage(), m_edgeMode);
</del><ins>+ boxBlur(src, dst, kernelSizeY, dyLeft, dyRight, stride, 4, paintSize.height(), paintSize.width(), isAlphaImage, edgeMode);
</ins><span class="cx"> #endif
</span><span class="cx"> std::swap(src, dst);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // The final result should be stored in srcPixelArray.
- if (dst == srcPixelArray) {
</del><ins>+ // The final result should be stored in src.
+ if (dst == src) {
</ins><span class="cx"> ASSERT(src->length() == dst->length());
</span><span class="cx"> memcpy(dst->data(), src->data(), src->length());
</span><span class="cx"> }
</span><ins>+}
</ins><span class="cx">
</span><ins>+inline void FEGaussianBlur::platformApplyGeneric(Uint8ClampedArray* srcPixelArray, Uint8ClampedArray* tmpPixelArray, unsigned kernelSizeX, unsigned kernelSizeY, IntSize& paintSize)
+{
+ int stride = 4 * paintSize.width();
+
+#if HAVE(ACCELERATE)
+ if (kernelSizeX == kernelSizeY && (m_edgeMode == EDGEMODE_NONE || m_edgeMode == EDGEMODE_DUPLICATE)) {
+ accelerateBoxBlur(srcPixelArray, tmpPixelArray, kernelSizeX, stride, paintSize.width(), paintSize.height());
+ return;
+ }
+#endif
+
+ standardBoxBlur(srcPixelArray, tmpPixelArray, kernelSizeX, kernelSizeY, stride, paintSize, isAlphaImage(), m_edgeMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FEGaussianBlur::platformApplyWorker(PlatformApplyParameters* parameters)
</span><span class="lines">@@ -319,6 +400,7 @@
</span><span class="cx">
</span><span class="cx"> inline void FEGaussianBlur::platformApply(Uint8ClampedArray* srcPixelArray, Uint8ClampedArray* tmpPixelArray, unsigned kernelSizeX, unsigned kernelSizeY, IntSize& paintSize)
</span><span class="cx"> {
</span><ins>+#if !HAVE(ACCELERATE)
</ins><span class="cx"> int scanline = 4 * paintSize.width();
</span><span class="cx"> int extraHeight = 3 * kernelSizeY * 0.5f;
</span><span class="cx"> int optimalThreadNumber = (paintSize.width() * paintSize.height()) / (s_minimalRectDimension + extraHeight * paintSize.width());
</span><span class="lines">@@ -380,6 +462,7 @@
</span><span class="cx"> }
</span><span class="cx"> // Fallback to single threaded mode.
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // The selection here eventually should happen dynamically on some platforms.
</span><span class="cx"> platformApplyGeneric(srcPixelArray, tmpPixelArray, kernelSizeX, kernelSizeY, paintSize);
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformgraphicsfiltersFEGaussianBlurh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/filters/FEGaussianBlur.h (178844 => 178845)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/filters/FEGaussianBlur.h 2015-01-21 18:44:33 UTC (rev 178844)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/filters/FEGaussianBlur.h 2015-01-21 18:46:33 UTC (rev 178845)
</span><span class="lines">@@ -71,7 +71,6 @@
</span><span class="cx">
</span><span class="cx"> FEGaussianBlur(Filter*, float, float, EdgeModeType);
</span><span class="cx">
</span><del>- static inline void kernelPosition(int boxBlur, unsigned& std, int& dLeft, int& dRight);
</del><span class="cx"> inline void platformApply(Uint8ClampedArray* srcPixelArray, Uint8ClampedArray* tmpPixelArray, unsigned kernelSizeX, unsigned kernelSizeY, IntSize& paintSize);
</span><span class="cx">
</span><span class="cx"> inline void platformApplyGeneric(Uint8ClampedArray* srcPixelArray, Uint8ClampedArray* tmpPixelArray, unsigned kernelSizeX, unsigned kernelSizeY, IntSize& paintSize);
</span><span class="lines">@@ -81,34 +80,6 @@
</span><span class="cx"> EdgeModeType m_edgeMode;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline void FEGaussianBlur::kernelPosition(int boxBlur, unsigned& std, int& dLeft, int& dRight)
-{
- // check http://www.w3.org/TR/SVG/filters.html#feGaussianBlurElement for details
- switch (boxBlur) {
- case 0:
- if (!(std % 2)) {
- dLeft = std / 2 - 1;
- dRight = std - dLeft;
- } else {
- dLeft = std / 2;
- dRight = std - dLeft;
- }
- break;
- case 1:
- if (!(std % 2)) {
- dLeft++;
- dRight--;
- }
- break;
- case 2:
- if (!(std % 2)) {
- dRight++;
- std++;
- }
- break;
- }
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(FILTERS)
</span></span></pre>
</div>
</div>
</body>
</html>