<!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>[185846] trunk</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/185846">185846</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-06-22 15:06:45 -0700 (Mon, 22 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Element with blur backdrop-filter shows edge duplication and dark edges
https://bugs.webkit.org/show_bug.cgi?id=146215
<rdar://problem/20367695>
Reviewed by Tim Horton.
Source/WebCore:
The input images to backdrop filters should duplicate their edge pixels
outwards, rather than using transparent pixels. This is a flag we
set on the Gaussian blur, but means we have to remember if the
FilterOperations list came from a regular filter or a backdrop filter.
Test: css3/filters/backdrop/blur-input-bounds.html
* css/CSSPropertyNames.in: New custom convertor for backdrop-filter.
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertBackdropFilterOperations): New convertor
that sets the backdrop flag, but is otherwise the same as a normal filter
convertor.
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::blendFilterOperations): Inherit the backdrop flag if either of our
inputs has it.
* platform/graphics/ca/mac/PlatformCAFiltersMac.mm: Set the inputNormalizeEdges
key on the CAFilter if necessary.
* platform/graphics/filters/FilterOperations.cpp: Add a new flag indicating if
these operations are intended for backdrops.
(WebCore::FilterOperations::operator=):
(WebCore::FilterOperations::operator==):
* platform/graphics/filters/FilterOperations.h:
(WebCore::FilterOperations::isUsedForBackdropFilters):
(WebCore::FilterOperations::setUsedForBackdropFilters):
LayoutTests:
Add a pixel test to show that the input images to backdrop filters should duplicate their
edge pixels. Unfortunately this is not reproducible with normal filters, so it
can't be a reference test.
* css3/filters/backdrop/blur-input-bounds.html: Added.
* platform/mac/css3/filters/backdrop/blur-input-bounds-expected.png: Added.
* platform/mac/css3/filters/backdrop/blur-input-bounds-expected.txt: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
<li><a href="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacPlatformCAFiltersMacmm">trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFilterOperationscpp">trunk/Source/WebCore/platform/graphics/filters/FilterOperations.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFilterOperationsh">trunk/Source/WebCore/platform/graphics/filters/FilterOperations.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3filtersbackdropblurinputboundshtml">trunk/LayoutTests/css3/filters/backdrop/blur-input-bounds.html</a></li>
<li>trunk/LayoutTests/platform/mac/css3/filters/backdrop/</li>
<li><a href="#trunkLayoutTestsplatformmaccss3filtersbackdropblurinputboundsexpectedpng">trunk/LayoutTests/platform/mac/css3/filters/backdrop/blur-input-bounds-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3filtersbackdropblurinputboundsexpectedtxt">trunk/LayoutTests/platform/mac/css3/filters/backdrop/blur-input-bounds-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185845 => 185846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-06-22 22:02:09 UTC (rev 185845)
+++ trunk/LayoutTests/ChangeLog        2015-06-22 22:06:45 UTC (rev 185846)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-06-22 Dean Jackson <dino@apple.com>
+
+ Element with blur backdrop-filter shows edge duplication and dark edges
+ https://bugs.webkit.org/show_bug.cgi?id=146215
+ <rdar://problem/20367695>
+
+ Reviewed by Tim Horton.
+
+ Add a pixel test to show that the input images to backdrop filters should duplicate their
+ edge pixels. Unfortunately this is not reproducible with normal filters, so it
+ can't be a reference test.
+
+ * css3/filters/backdrop/blur-input-bounds.html: Added.
+ * platform/mac/css3/filters/backdrop/blur-input-bounds-expected.png: Added.
+ * platform/mac/css3/filters/backdrop/blur-input-bounds-expected.txt: Added.
+
</ins><span class="cx"> 2015-06-22 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Arabic text styled with Georgia is rendered as boxes
</span></span></pre></div>
<a id="trunkLayoutTestscss3filtersbackdropblurinputboundshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/filters/backdrop/blur-input-bounds.html (0 => 185846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/backdrop/blur-input-bounds.html         (rev 0)
+++ trunk/LayoutTests/css3/filters/backdrop/blur-input-bounds.html        2015-06-22 22:06:45 UTC (rev 185846)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<style>
+div {
+ display: inline-block;
+ position: relative;
+ margin: 10px;
+ width: 160px;
+ height: 80px;
+}
+
+img {
+ position: absolute;
+ top: 0;
+ left: 0;
+ margin: 0;
+ padding: 0;
+}
+
+p {
+ position: absolute;
+ top: 10px;
+ left: 20px;
+ width: 120px;
+ height: 60px;
+ margin: 0;
+ padding: 0;
+}
+
+</style>
+<div>
+ <img src="../resources/reference.png">
+ <p style="-webkit-backdrop-filter: blur(10px)"></p>
+</div>
</ins><span class="cx">Property changes on: trunk/LayoutTests/css3/filters/backdrop/blur-input-bounds.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsplatformmaccss3filtersbackdropblurinputboundsexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac/css3/filters/backdrop/blur-input-bounds-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/css3/filters/backdrop/blur-input-bounds-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmaccss3filtersbackdropblurinputboundsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/css3/filters/backdrop/blur-input-bounds-expected.txt (0 => 185846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css3/filters/backdrop/blur-input-bounds-expected.txt         (rev 0)
+++ trunk/LayoutTests/platform/mac/css3/filters/backdrop/blur-input-bounds-expected.txt        2015-06-22 22:06:45 UTC (rev 185846)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderText {#text} at (0,0) size 0x0
+layer at (18,18) size 160x80
+ RenderBlock (relative positioned) {DIV} at (10,10) size 160x80
+layer at (18,18) size 160x90
+ RenderImage {IMG} at (0,0) size 160x90
+layer at (38,28) size 120x60
+ RenderBlock (positioned) {P} at (20,10) size 120x60
</ins><span class="cx">Property changes on: trunk/LayoutTests/platform/mac/css3/filters/backdrop/blur-input-bounds-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185845 => 185846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-06-22 22:02:09 UTC (rev 185845)
+++ trunk/Source/WebCore/ChangeLog        2015-06-22 22:06:45 UTC (rev 185846)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-06-22 Dean Jackson <dino@apple.com>
+
+ Element with blur backdrop-filter shows edge duplication and dark edges
+ https://bugs.webkit.org/show_bug.cgi?id=146215
+ <rdar://problem/20367695>
+
+ Reviewed by Tim Horton.
+
+ The input images to backdrop filters should duplicate their edge pixels
+ outwards, rather than using transparent pixels. This is a flag we
+ set on the Gaussian blur, but means we have to remember if the
+ FilterOperations list came from a regular filter or a backdrop filter.
+
+ Test: css3/filters/backdrop/blur-input-bounds.html
+
+ * css/CSSPropertyNames.in: New custom convertor for backdrop-filter.
+ * css/StyleBuilderConverter.h:
+ (WebCore::StyleBuilderConverter::convertBackdropFilterOperations): New convertor
+ that sets the backdrop flag, but is otherwise the same as a normal filter
+ convertor.
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::blendFilterOperations): Inherit the backdrop flag if either of our
+ inputs has it.
+ * platform/graphics/ca/mac/PlatformCAFiltersMac.mm: Set the inputNormalizeEdges
+ key on the CAFilter if necessary.
+ * platform/graphics/filters/FilterOperations.cpp: Add a new flag indicating if
+ these operations are intended for backdrops.
+ (WebCore::FilterOperations::operator=):
+ (WebCore::FilterOperations::operator==):
+ * platform/graphics/filters/FilterOperations.h:
+ (WebCore::FilterOperations::isUsedForBackdropFilters):
+ (WebCore::FilterOperations::setUsedForBackdropFilters):
+
</ins><span class="cx"> 2015-06-22 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> [TextIndicator] Text shifts one pixel to the left when I force click to bring up Lookup in Mail messages
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (185845 => 185846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in        2015-06-22 22:02:09 UTC (rev 185845)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in        2015-06-22 22:06:45 UTC (rev 185846)
</span><span class="lines">@@ -476,7 +476,7 @@
</span><span class="cx"> justify-content [Initial=initialContentAlignment, Converter=ContentAlignmentData]
</span><span class="cx"> -webkit-justify-content = justify-content
</span><span class="cx"> #if defined(ENABLE_FILTERS_LEVEL_2) && ENABLE_FILTERS_LEVEL_2
</span><del>--webkit-backdrop-filter [ConditionalConverter=FilterOperations]
</del><ins>+-webkit-backdrop-filter [ConditionalConverter=BackdropFilterOperations]
</ins><span class="cx"> #endif
</span><span class="cx"> justify-self [Initial=initialSelfAlignment, Converter=SelfOrDefaultAlignmentData]
</span><span class="cx"> -webkit-font-size-delta [SkipBuilder]
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (185845 => 185846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h        2015-06-22 22:02:09 UTC (rev 185845)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h        2015-06-22 22:06:45 UTC (rev 185846)
</span><span class="lines">@@ -104,6 +104,9 @@
</span><span class="cx"> static Optional<float> convertPerspective(StyleResolver&, CSSValue&);
</span><span class="cx"> static Optional<Length> convertMarqueeIncrement(StyleResolver&, CSSValue&);
</span><span class="cx"> static Optional<FilterOperations> convertFilterOperations(StyleResolver&, CSSValue&);
</span><ins>+#if ENABLE(FILTERS_LEVEL_2)
+ static Optional<FilterOperations> convertBackdropFilterOperations(StyleResolver&, CSSValue&);
+#endif
</ins><span class="cx"> static Vector<RefPtr<MaskImageOperation>> convertMaskImageOperations(StyleResolver&, CSSValue&);
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> static bool convertTouchCallout(StyleResolver&, CSSValue&);
</span><span class="lines">@@ -1005,6 +1008,18 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(FILTERS_LEVEL_2)
+inline Optional<FilterOperations> StyleBuilderConverter::convertBackdropFilterOperations(StyleResolver& styleResolver, CSSValue& value)
+{
+ FilterOperations operations;
+ if (styleResolver.createFilterOperations(value, operations)) {
+ operations.setUsedForBackdropFilters(true);
+ return operations;
+ }
+ return Nullopt;
+}
+#endif
+
</ins><span class="cx"> static inline WebKitCSSResourceValue* maskImageValueFromIterator(CSSValueList& maskImagesList, CSSValueList::iterator it)
</span><span class="cx"> {
</span><span class="cx"> // May also be a CSSInitialValue.
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (185845 => 185846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp        2015-06-22 22:02:09 UTC (rev 185845)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp        2015-06-22 22:06:45 UTC (rev 185846)
</span><span class="lines">@@ -192,6 +192,10 @@
</span><span class="cx"> result.operations().append(fromOp ? fromOp : identityOp);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+#if ENABLE(FILTERS_LEVEL_2)
+ result.setUsedForBackdropFilters(from.isUsedForBackdropFilters() || to.isUsedForBackdropFilters());
+#endif
+
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCAFiltersMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm (185845 => 185846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm        2015-06-22 22:02:09 UTC (rev 185845)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm        2015-06-22 22:06:45 UTC (rev 185846)
</span><span class="lines">@@ -161,6 +161,10 @@
</span><span class="cx"> const auto& blurOperation = downcast<BlurFilterOperation>(filterOperation);
</span><span class="cx"> CAFilter *filter = [CAFilter filterWithType:kCAFilterGaussianBlur];
</span><span class="cx"> [filter setValue:[NSNumber numberWithFloat:floatValueForLength(blurOperation.stdDeviation(), 0)] forKey:@"inputRadius"];
</span><ins>+#if ENABLE(FILTERS_LEVEL_2)
+ if (filters.isUsedForBackdropFilters())
+ [filter setValue:[NSNumber numberWithBool:YES] forKey:@"inputNormalizeEdges"];
+#endif
</ins><span class="cx"> [filter setName:filterName];
</span><span class="cx"> [array.get() addObject:filter];
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFilterOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperations.cpp (185845 => 185846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FilterOperations.cpp        2015-06-22 22:02:09 UTC (rev 185845)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperations.cpp        2015-06-22 22:06:45 UTC (rev 185846)
</span><span class="lines">@@ -51,6 +51,9 @@
</span><span class="cx"> FilterOperations& FilterOperations::operator=(const FilterOperations& other)
</span><span class="cx"> {
</span><span class="cx"> m_operations = other.m_operations;
</span><ins>+#if ENABLE(FILTERS_LEVEL_2)
+ m_usedForBackdropFilters = other.m_usedForBackdropFilters;
+#endif
</ins><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -58,7 +61,12 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_operations.size() != o.m_operations.size())
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
+#if ENABLE(FILTERS_LEVEL_2)
+ if (m_usedForBackdropFilters != o.m_usedForBackdropFilters)
+ return false;
+#endif
+
</ins><span class="cx"> unsigned s = m_operations.size();
</span><span class="cx"> for (unsigned i = 0; i < s; i++) {
</span><span class="cx"> if (*m_operations[i] != *o.m_operations[i])
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFilterOperationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperations.h (185845 => 185846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FilterOperations.h        2015-06-22 22:02:09 UTC (rev 185845)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperations.h        2015-06-22 22:06:45 UTC (rev 185846)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> FilterOperations(const FilterOperations& other) { *this = other; }
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT FilterOperations& operator=(const FilterOperations&);
</span><del>-
</del><ins>+
</ins><span class="cx"> bool operator==(const FilterOperations&) const;
</span><span class="cx"> bool operator!=(const FilterOperations& o) const
</span><span class="cx"> {
</span><span class="lines">@@ -70,8 +70,17 @@
</span><span class="cx"> bool hasFilterThatMovesPixels() const;
</span><span class="cx">
</span><span class="cx"> bool hasReferenceFilter() const;
</span><ins>+
+#if ENABLE(FILTERS_LEVEL_2)
+ bool isUsedForBackdropFilters() const { return m_usedForBackdropFilters; }
+ void setUsedForBackdropFilters(bool usedForBackdrop) { m_usedForBackdropFilters = usedForBackdrop; }
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> Vector<RefPtr<FilterOperation>> m_operations;
</span><ins>+#if ENABLE(FILTERS_LEVEL_2)
+ bool m_usedForBackdropFilters { false };
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>