<!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>[175687] 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/175687">175687</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-05 23:43:41 -0800 (Wed, 05 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/175672">r175672</a>.
https://bugs.webkit.org/show_bug.cgi?id=138455
Tries to make backdrop layers on every layer, asserts on
Mavericks (Requested by smfr on #webkit).
Reverted changeset:
"[filters2] Support for backdrop-filter"
https://bugs.webkit.org/show_bug.cgi?id=138384
http://trac.webkit.org/changeset/175672</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksTestExpectations">trunk/LayoutTests/platform/mac-mavericks/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationKeyframeAnimationcpp">trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayerh">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMacmm">trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingh">trunk/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerModelObjectcpp">trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerBackingStoremm">trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm">trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosRemoteLayerTreeHostIOSmm">trunk/Source/WebKit2/UIProcess/ios/RemoteLayerTreeHostIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeHostmm">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/LayoutTests/css3/filters/backdrop/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/LayoutTests/ChangeLog 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-11-05 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r175672.
+ https://bugs.webkit.org/show_bug.cgi?id=138455
+
+ Tries to make backdrop layers on every layer, asserts on
+ Mavericks (Requested by smfr on #webkit).
+
+ Reverted changeset:
+
+ "[filters2] Support for backdrop-filter"
+ https://bugs.webkit.org/show_bug.cgi?id=138384
+ http://trac.webkit.org/changeset/175672
+
</ins><span class="cx"> 2014-11-04 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> [filters2] Support for backdrop-filter
</span></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/TestExpectations 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -446,9 +446,6 @@
</span><span class="cx"> media/encrypted-media/encrypted-media-not-loaded.html [ WontFix ]
</span><span class="cx"> media/encrypted-media/encrypted-media-syntax.html [ WontFix ]
</span><span class="cx">
</span><del>-# No support for Filters Level 2 on EFL yet
-Bug(EFL) css3/filters/backdrop [ Skip ]
-
</del><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # CRASHES
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -443,9 +443,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/133806 svg/masking/mask-transformed-text-missing.svg [ ImageOnlyFailure ]
</span><span class="cx">
</span><del>-# No support for Filters Level 2 on GTK yet
-Bug(GTK) css3/filters/backdrop [ Skip ]
-
</del><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End of Expected failures
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/TestExpectations (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/TestExpectations 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/LayoutTests/platform/mac-mavericks/TestExpectations 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -1,5 +1,2 @@
</span><span class="cx"> # This test should only be run on Yosemite or later.
</span><span class="cx"> platform/mac/editing/input/undo-grouping-on-text-insertion.html [ Skip ]
</span><del>-
-# Backdrop filters are not supported on Mavericks
-css3/filters/backdrop [ Skip ]
</del></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/LayoutTests/platform/win/TestExpectations 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx"> css3/filters/animation-from-initial-values-with-color-matrix.html
</span><span class="cx"> css3/filters/filter-is-on-subpixel-position.html
</span><span class="cx"> css3/masking/clip-path-filter.html
</span><del>-css3/filters/backdrop
</del><span class="cx">
</span><span class="cx"> # Remove from list after enabling CANVAS_PATH
</span><span class="cx"> fast/canvas/canvas-path-constructors.html
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/ChangeLog 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-11-05 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r175672.
+ https://bugs.webkit.org/show_bug.cgi?id=138455
+
+ Tries to make backdrop layers on every layer, asserts on
+ Mavericks (Requested by smfr on #webkit).
+
+ Reverted changeset:
+
+ "[filters2] Support for backdrop-filter"
+ https://bugs.webkit.org/show_bug.cgi?id=138384
+ http://trac.webkit.org/changeset/175672
+
</ins><span class="cx"> 2014-11-04 Ada Chan <adachan@apple.com>
</span><span class="cx">
</span><span class="cx"> Figure out whether a plug-in is playing audio.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -549,7 +549,6 @@
</span><span class="cx"> __ZN7WebCore15GraphicsContextC1EP9CGContext
</span><span class="cx"> __ZN7WebCore15GraphicsContextD1Ev
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA10initializeEv
</span><del>-__ZN7WebCore15GraphicsLayerCA18setBackdropFiltersERKNS_16FilterOperationsE
</del><span class="cx"> __ZN7WebCore15GraphicsLayerCA10setFiltersERKNS_16FilterOperationsE
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA10setOpacityEf
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA11setChildrenERKN3WTF6VectorIPNS_13GraphicsLayerELm0ENS1_15CrashOnOverflowEEE
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -291,9 +291,6 @@
</span><span class="cx"> CSSPropertyJustifyContent,
</span><span class="cx"> CSSPropertyWebkitJustifySelf,
</span><span class="cx"> CSSPropertyWebkitFilter,
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- CSSPropertyWebkitBackdropFilter,
-#endif
</del><span class="cx"> CSSPropertyWebkitFontKerning,
</span><span class="cx"> CSSPropertyWebkitFontSmoothing,
</span><span class="cx"> CSSPropertyWebkitFontVariantLigatures,
</span><span class="lines">@@ -1602,9 +1599,6 @@
</span><span class="cx"> case CSSPropertyWebkitTransformOrigin:
</span><span class="cx"> case CSSPropertyWebkitTransform:
</span><span class="cx"> case CSSPropertyWebkitFilter:
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- case CSSPropertyWebkitBackdropFilter:
-#endif
</del><span class="cx"> return true;
</span><span class="cx"> case CSSPropertyMargin: {
</span><span class="cx"> if (!renderer || !renderer->isBox())
</span><span class="lines">@@ -2897,10 +2891,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> case CSSPropertyWebkitFilter:
</span><span class="cx"> return valueForFilter(style.get(), style->filter());
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- case CSSPropertyWebkitBackdropFilter:
- return valueForFilter(style.get(), style->backdropFilter());
-#endif
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> case CSSPropertyMixBlendMode:
</span><span class="cx"> return cssValuePool().createValue(style->blendMode());
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -2455,9 +2455,6 @@
</span><span class="cx"> validPrimitive = validUnit(value, FInteger | FNonNeg, CSSStrictMode) && value->fValue;
</span><span class="cx"> break;
</span><span class="cx"> case CSSPropertyWebkitFilter:
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- case CSSPropertyWebkitBackdropFilter:
-#endif
</del><span class="cx"> if (id == CSSValueNone)
</span><span class="cx"> validPrimitive = true;
</span><span class="cx"> else {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -371,9 +371,6 @@
</span><span class="cx"> -webkit-flex-wrap = flex-wrap
</span><span class="cx"> justify-content [NewStyleBuilder]
</span><span class="cx"> -webkit-justify-content = justify-content
</span><del>-#if defined(ENABLE_FILTERS_LEVEL_2) && ENABLE_FILTERS_LEVEL_2
--webkit-backdrop-filter
-#endif
</del><span class="cx"> -webkit-justify-self
</span><span class="cx"> -webkit-font-size-delta
</span><span class="cx"> #if defined(ENABLE_CSS_GRID_LAYOUT) && ENABLE_CSS_GRID_LAYOUT
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -1259,9 +1259,6 @@
</span><span class="cx"> || style.clipPath()
</span><span class="cx"> || style.boxReflect()
</span><span class="cx"> || style.hasFilter()
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- || style.hasBackdropFilter()
-#endif
</del><span class="cx"> || style.hasBlendMode()
</span><span class="cx"> || style.hasIsolation()
</span><span class="cx"> || style.position() == StickyPosition
</span><span class="lines">@@ -1355,9 +1352,6 @@
</span><span class="cx"> if (style.preserves3D() && (style.overflowX() != OVISIBLE
</span><span class="cx"> || style.overflowY() != OVISIBLE
</span><span class="cx"> || style.hasFilter()
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- || style.hasBackdropFilter()
-#endif
</del><span class="cx"> || style.hasBlendMode()))
</span><span class="cx"> style.setTransformStyle3D(TransformStyle3DFlat);
</span><span class="cx">
</span><span class="lines">@@ -2708,16 +2702,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- case CSSPropertyWebkitBackdropFilter: {
- HANDLE_INHERIT_AND_INITIAL(backdropFilter, BackdropFilter);
- FilterOperations operations;
- if (createFilterOperations(value, operations))
- state.style()->setBackdropFilter(operations);
- return;
- }
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> case CSSPropertyWebkitGridAutoColumns: {
</span><span class="cx"> HANDLE_INHERIT_AND_INITIAL(gridAutoColumns, GridAutoColumns);
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationKeyframeAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -362,11 +362,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_filterFunctionListsMatch = false;
</span><span class="cx">
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- if (m_keyframes.size() < 2 || (!m_keyframes.containsProperty(CSSPropertyWebkitFilter) && !m_keyframes.containsProperty(CSSPropertyWebkitBackdropFilter)))
-#else
</del><span class="cx"> if (m_keyframes.size() < 2 || !m_keyframes.containsProperty(CSSPropertyWebkitFilter))
</span><del>-#endif
</del><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Empty filters match anything, so find the first non-empty entry as the reference
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -325,8 +325,6 @@
</span><span class="cx"> bool acceleratesDrawing() const { return m_acceleratesDrawing; }
</span><span class="cx"> virtual void setAcceleratesDrawing(bool b) { m_acceleratesDrawing = b; }
</span><span class="cx">
</span><del>- bool needsBackdrop() const { return !m_backdropFilters.isEmpty(); }
-
</del><span class="cx"> // The color used to paint the layer background. Pass an invalid color to remove it.
</span><span class="cx"> // Note that this covers the entire layer. Use setContentsToSolidColor() if the color should
</span><span class="cx"> // only cover the contentsRect.
</span><span class="lines">@@ -344,12 +342,10 @@
</span><span class="cx"> virtual void setOpacity(float opacity) { m_opacity = opacity; }
</span><span class="cx">
</span><span class="cx"> const FilterOperations& filters() const { return m_filters; }
</span><del>- // Returns true if filter can be rendered by the compositor.
</del><ins>+
+ // Returns true if filter can be rendered by the compositor
</ins><span class="cx"> virtual bool setFilters(const FilterOperations& filters) { m_filters = filters; return true; }
</span><span class="cx">
</span><del>- const FilterOperations& backdropFilters() const { return m_backdropFilters; }
- virtual bool setBackdropFilters(const FilterOperations& filters) { m_backdropFilters = filters; return true; }
-
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> BlendMode blendMode() const { return m_blendMode; }
</span><span class="cx"> virtual void setBlendMode(BlendMode blendMode) { m_blendMode = blendMode; }
</span><span class="lines">@@ -522,7 +518,6 @@
</span><span class="cx"> // when compositing is not done in hardware. It is not virtual, so the caller
</span><span class="cx"> // needs to notifiy the change to the platform layer as needed.
</span><span class="cx"> void clearFilters() { m_filters.clear(); }
</span><del>- void clearBackdropFilters() { m_backdropFilters.clear(); }
</del><span class="cx">
</span><span class="cx"> // Given a KeyframeValueList containing filterOperations, return true if the operations are valid.
</span><span class="cx"> static int validateFilterOperations(const KeyframeValueList&);
</span><span class="lines">@@ -569,7 +564,6 @@
</span><span class="cx"> float m_zPosition;
</span><span class="cx">
</span><span class="cx"> FilterOperations m_filters;
</span><del>- FilterOperations m_backdropFilters;
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> BlendMode m_blendMode;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> return PlatformCALayerWin::filtersCanBeComposited(filters);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> PassRefPtr<PlatformCALayer> GraphicsLayerCA::createPlatformCALayer(PlatformCALayer::LayerType layerType, PlatformCALayerClient* owner)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -376,10 +376,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_structuralLayer)
</span><span class="cx"> m_structuralLayer->setOwner(nullptr);
</span><del>-
- if (m_backdropLayer)
- m_backdropLayer->setOwner(nullptr);
-
</del><ins>+
</ins><span class="cx"> removeCloneLayers();
</span><span class="cx">
</span><span class="cx"> GraphicsLayer::willBeDestroyed();
</span><span class="lines">@@ -570,7 +567,7 @@
</span><span class="cx"> size_t numAnimations = propertyAnimations.size();
</span><span class="cx"> for (size_t i = 0; i < numAnimations; ++i) {
</span><span class="cx"> const LayerPropertyAnimation& currAnimation = propertyAnimations[i];
</span><del>-
</del><ins>+
</ins><span class="cx"> if (currAnimation.m_property == AnimatedPropertyWebkitTransform || currAnimation.m_property == AnimatedPropertyOpacity
</span><span class="cx"> || currAnimation.m_property == AnimatedPropertyBackgroundColor
</span><span class="cx"> || currAnimation.m_property == AnimatedPropertyWebkitFilter
</span><span class="lines">@@ -688,26 +685,6 @@
</span><span class="cx"> return canCompositeFilters;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool GraphicsLayerCA::setBackdropFilters(const FilterOperations& filterOperations)
-{
- bool canCompositeFilters = filtersCanBeComposited(filterOperations);
-
- if (m_backdropFilters == filterOperations)
- return canCompositeFilters;
-
- // Filters cause flattening, so we should never have filters on a layer with preserves3D().
- ASSERT(!filterOperations.size() || !preserves3D());
-
- if (canCompositeFilters)
- GraphicsLayer::setBackdropFilters(filterOperations);
- else {
- // FIXME: This would clear the backdrop filters if we had a software implementation.
- clearBackdropFilters();
- }
- noteLayerPropertyChanged(BackdropFiltersChanged);
- return canCompositeFilters;
-}
-
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> void GraphicsLayerCA::setBlendMode(BlendMode blendMode)
</span><span class="cx"> {
</span><span class="lines">@@ -822,7 +799,7 @@
</span><span class="cx">
</span><span class="cx"> if (createdAnimations)
</span><span class="cx"> noteLayerPropertyChanged(AnimationChanged);
</span><del>-
</del><ins>+
</ins><span class="cx"> return createdAnimations;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1288,7 +1265,7 @@
</span><span class="cx"> swapFromOrToTiledLayer(needTiledLayer);
</span><span class="cx">
</span><span class="cx"> // Need to handle Preserves3DChanged first, because it affects which layers subsequent properties are applied to
</span><del>- if (m_uncommittedChanges & (Preserves3DChanged | ReplicatedLayerChanged | BackdropFiltersChanged))
</del><ins>+ if (m_uncommittedChanges & (Preserves3DChanged | ReplicatedLayerChanged))
</ins><span class="cx"> updateStructuralLayer();
</span><span class="cx">
</span><span class="cx"> if (m_uncommittedChanges & GeometryChanged)
</span><span class="lines">@@ -1337,9 +1314,6 @@
</span><span class="cx"> if (m_uncommittedChanges & FiltersChanged)
</span><span class="cx"> updateFilters();
</span><span class="cx">
</span><del>- if (m_uncommittedChanges & BackdropFiltersChanged)
- updateBackdropFilters();
-
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> if (m_uncommittedChanges & BlendModeChanged)
</span><span class="cx"> updateBlendMode();
</span><span class="lines">@@ -1426,9 +1400,6 @@
</span><span class="cx"> case StructuralLayerForReplicaFlattening:
</span><span class="cx"> m_structuralLayer->setName("Replica flattening layer " + name());
</span><span class="cx"> break;
</span><del>- case StructuralLayerForBackdrop:
- m_structuralLayer->setName("Backdrop hosting layer " + name());
- break;
</del><span class="cx"> case NoStructuralLayer:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -1453,9 +1424,6 @@
</span><span class="cx"> primaryLayerChildren.appendVector(*customSublayers);
</span><span class="cx">
</span><span class="cx"> if (m_structuralLayer) {
</span><del>- if (m_backdropLayer)
- structuralLayerChildren.append(m_backdropLayer);
-
</del><span class="cx"> if (m_replicaLayer)
</span><span class="cx"> structuralLayerChildren.append(downcast<GraphicsLayerCA>(*m_replicaLayer).primaryLayer());
</span><span class="cx">
</span><span class="lines">@@ -1542,12 +1510,6 @@
</span><span class="cx"> m_layer->setBounds(adjustedBounds);
</span><span class="cx"> m_layer->setAnchorPoint(scaledAnchorPoint);
</span><span class="cx">
</span><del>- if (m_backdropLayer) {
- m_backdropLayer->setPosition(adjustedPosition);
- m_backdropLayer->setBounds(adjustedBounds);
- m_backdropLayer->setAnchorPoint(scaledAnchorPoint);
- }
-
</del><span class="cx"> if (LayerMap* layerCloneMap = m_layerClones.get()) {
</span><span class="cx"> LayerMap::const_iterator end = layerCloneMap->end();
</span><span class="cx"> for (LayerMap::const_iterator it = layerCloneMap->begin(); it != end; ++it) {
</span><span class="lines">@@ -1678,18 +1640,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsLayerCA::updateBackdropFilters()
-{
- if (!m_backdropLayer) {
- m_backdropLayer = createPlatformCALayer(PlatformCALayer::LayerTypeBackdropLayer, this);
- m_backdropLayer->setPosition(m_layer->position());
- m_backdropLayer->setBounds(m_layer->bounds());
- m_backdropLayer->setAnchorPoint(m_layer->anchorPoint());
- m_backdropLayer->setMasksToBounds(true);
- }
- m_backdropLayer->setFilters(m_backdropFilters);
-}
-
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> void GraphicsLayerCA::updateBlendMode()
</span><span class="cx"> {
</span><span class="lines">@@ -1720,7 +1670,6 @@
</span><span class="cx"> | ChildrenChanged
</span><span class="cx"> | BackfaceVisibilityChanged
</span><span class="cx"> | FiltersChanged
</span><del>- | BackdropFiltersChanged
</del><span class="cx"> | OpacityChanged;
</span><span class="cx">
</span><span class="cx"> if (purpose == NoStructuralLayer) {
</span><span class="lines">@@ -1800,10 +1749,7 @@
</span><span class="cx">
</span><span class="cx"> if (isReplicated())
</span><span class="cx"> return StructuralLayerForReplicaFlattening;
</span><del>-
- if (needsBackdrop())
- return StructuralLayerForBackdrop;
-
</del><ins>+
</ins><span class="cx"> return NoStructuralLayer;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2316,7 +2262,7 @@
</span><span class="cx"> bool GraphicsLayerCA::createAnimationFromKeyframes(const KeyframeValueList& valueList, const Animation* animation, const String& animationName, double timeOffset)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(valueList.property() != AnimatedPropertyWebkitTransform && (!supportsAcceleratedFilterAnimations() || valueList.property() != AnimatedPropertyWebkitFilter));
</span><del>-
</del><ins>+
</ins><span class="cx"> bool isKeyframe = valueList.size() > 2;
</span><span class="cx"> bool valuesOK;
</span><span class="cx">
</span><span class="lines">@@ -3053,7 +2999,6 @@
</span><span class="cx"> | ContentsScaleChanged
</span><span class="cx"> | AcceleratesDrawingChanged
</span><span class="cx"> | FiltersChanged
</span><del>- | BackdropFiltersChanged
</del><span class="cx"> | MaskLayerChanged
</span><span class="cx"> | OpacityChanged
</span><span class="cx"> | DebugIndicatorsChanged;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -105,8 +105,6 @@
</span><span class="cx"> WEBCORE_EXPORT virtual bool setFilters(const FilterOperations&) override;
</span><span class="cx"> virtual bool filtersCanBeComposited(const FilterOperations&);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT virtual bool setBackdropFilters(const FilterOperations&) override;
-
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> WEBCORE_EXPORT virtual void setBlendMode(BlendMode) override;
</span><span class="cx"> #endif
</span><span class="lines">@@ -204,7 +202,6 @@
</span><span class="cx"> WEBCORE_EXPORT void layerDidDisplay(PlatformCALayer*);
</span><span class="cx"> void updateOpacityOnLayer();
</span><span class="cx"> void updateFilters();
</span><del>- void updateBackdropFilters();
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> void updateBlendMode();
</span><span class="lines">@@ -386,8 +383,7 @@
</span><span class="cx"> enum StructuralLayerPurpose {
</span><span class="cx"> NoStructuralLayer = 0,
</span><span class="cx"> StructuralLayerForPreserves3D,
</span><del>- StructuralLayerForReplicaFlattening,
- StructuralLayerForBackdrop
</del><ins>+ StructuralLayerForReplicaFlattening
</ins><span class="cx"> };
</span><span class="cx"> void ensureStructuralLayer(StructuralLayerPurpose);
</span><span class="cx"> StructuralLayerPurpose structuralLayerPurpose() const;
</span><span class="lines">@@ -431,13 +427,12 @@
</span><span class="cx"> ContentsVisibilityChanged = 1LLU << 24,
</span><span class="cx"> VisibleRectChanged = 1LLU << 25,
</span><span class="cx"> FiltersChanged = 1LLU << 26,
</span><del>- BackdropFiltersChanged = 1LLU << 27,
- TilingAreaChanged = 1LLU << 28,
- TilesAdded = 1LLU < 29,
- DebugIndicatorsChanged = 1LLU << 30,
- CustomAppearanceChanged = 1LLU << 31,
- CustomBehaviorChanged = 1LLU << 32,
- BlendModeChanged = 1LLU << 33
</del><ins>+ TilingAreaChanged = 1LLU << 27,
+ TilesAdded = 1LLU < 28,
+ DebugIndicatorsChanged = 1LLU << 29,
+ CustomAppearanceChanged = 1LLU << 30,
+ CustomBehaviorChanged = 1LLU << 31,
+ BlendModeChanged = 1LLU << 32
</ins><span class="cx"> };
</span><span class="cx"> typedef uint64_t LayerChangeFlags;
</span><span class="cx"> enum ScheduleFlushOrNot { ScheduleFlush, DontScheduleFlush };
</span><span class="lines">@@ -451,7 +446,6 @@
</span><span class="cx"> RefPtr<PlatformCALayer> m_structuralLayer; // A layer used for structural reasons, like preserves-3d or replica-flattening. Is the parent of m_layer.
</span><span class="cx"> RefPtr<PlatformCALayer> m_contentsClippingLayer; // A layer used to clip inner content
</span><span class="cx"> RefPtr<PlatformCALayer> m_contentsLayer; // A layer used for inner content, like image and video
</span><del>- RefPtr<PlatformCALayer> m_backdropLayer; // The layer used for backdrop rendering, if necessary.
</del><span class="cx">
</span><span class="cx"> // References to clones of our layers, for replicated layers.
</span><span class="cx"> OwnPtr<LayerMap> m_layerClones;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -77,7 +77,6 @@
</span><span class="cx"> LayerTypeRootLayer,
</span><span class="cx"> LayerTypeAVPlayerLayer,
</span><span class="cx"> LayerTypeWebGLLayer,
</span><del>- LayerTypeBackdropLayer,
</del><span class="cx"> LayerTypeCustom
</span><span class="cx"> };
</span><span class="cx"> enum FilterType { Linear, Nearest, Trilinear };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -62,10 +62,6 @@
</span><span class="cx"> #import "ThemeMac.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
-@interface CABackdropLayer : CALayer
-@end
-#endif
</del><span class="cx">
</span><span class="cx"> SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
</span><span class="cx"> SOFT_LINK_CLASS(AVFoundation, AVPlayerLayer)
</span><span class="lines">@@ -237,14 +233,6 @@
</span><span class="cx"> case LayerTypeTransformLayer:
</span><span class="cx"> layerClass = [CATransformLayer class];
</span><span class="cx"> break;
</span><del>- case LayerTypeBackdropLayer:
-#if ENABLE(FILTERS_LEVEL_2)
- layerClass = [CABackdropLayer class];
-#else
- ASSERT_NOT_REACHED();
- layerClass = [CALayer class];
-#endif
- break;
</del><span class="cx"> case LayerTypeWebTiledLayer:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> bool borderImageIsLoadedAndCanBeRendered() const;
</span><span class="cx">
</span><span class="cx"> // Returns true if this renderer requires a new stacking context.
</span><del>- bool createsGroup() const { return isTransparent() || hasMask() || hasFilter() || hasBackdropFilter() || hasBlendMode(); }
</del><ins>+ bool createsGroup() const { return isTransparent() || hasMask() || hasFilter() || hasBlendMode(); }
</ins><span class="cx">
</span><span class="cx"> bool isTransparent() const { return style().opacity() < 1.0f; }
</span><span class="cx"> float opacity() const { return style().opacity(); }
</span><span class="lines">@@ -137,14 +137,6 @@
</span><span class="cx"> bool hasHiddenBackface() const { return style().backfaceVisibility() == BackfaceVisibilityHidden; }
</span><span class="cx">
</span><span class="cx"> bool hasFilter() const { return style().hasFilter(); }
</span><del>- bool hasBackdropFilter() const
- {
-#if ENABLE(FILTERS_LEVEL_2)
- return style().hasBackdropFilter();
-#else
- return false;
-#endif
- }
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> bool hasBlendMode() const { return style().hasBlendMode(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -315,6 +315,9 @@
</span><span class="cx">
</span><span class="cx"> bool RenderLayer::paintsWithFilters() const
</span><span class="cx"> {
</span><ins>+ // FIXME: Eventually there will be cases where we paint with filters even without accelerated compositing,
+ // and this whole function won't be inside the #if below.
+
</ins><span class="cx"> if (!renderer().hasFilter())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -6215,7 +6218,6 @@
</span><span class="cx"> && !renderer().hasTransform()
</span><span class="cx"> && !renderer().hasClipPath()
</span><span class="cx"> && !renderer().hasFilter()
</span><del>- && !renderer().hasBackdropFilter()
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> && !hasAcceleratedTouchScrolling()
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -791,14 +791,6 @@
</span><span class="cx">
</span><span class="cx"> void filterNeedsRepaint();
</span><span class="cx"> bool hasFilter() const { return renderer().hasFilter(); }
</span><del>- bool hasBackdropFilter() const
- {
-#if ENABLE(FILTERS_LEVEL_2)
- return renderer().hasBackdropFilter();
-#else
- return false;
-#endif
- }
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> bool hasBlendMode() const { return renderer().hasBlendMode(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -112,9 +112,6 @@
</span><span class="cx"> , m_usingTiledCacheLayer(false)
</span><span class="cx"> , m_requiresOwnBackingStore(true)
</span><span class="cx"> , m_canCompositeFilters(false)
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- , m_canCompositeBackdropFilters(false)
-#endif
</del><span class="cx"> , m_backgroundLayerPaintsFixedRootBackground(false)
</span><span class="cx"> {
</span><span class="cx"> Page* page = renderer().frame().page();
</span><span class="lines">@@ -314,9 +311,6 @@
</span><span class="cx"> updateOpacity(renderer().style());
</span><span class="cx"> updateTransform(renderer().style());
</span><span class="cx"> updateFilters(renderer().style());
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- updateBackdropFilters(renderer().style());
-#endif
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> updateBlendMode(renderer().style());
</span><span class="cx"> #endif
</span><span class="lines">@@ -381,13 +375,6 @@
</span><span class="cx"> m_canCompositeFilters = m_graphicsLayer->setFilters(style.filter());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
-void RenderLayerBacking::updateBackdropFilters(const RenderStyle& style)
-{
- m_canCompositeBackdropFilters = m_graphicsLayer->setBackdropFilters(style.backdropFilter());
-}
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> void RenderLayerBacking::updateBlendMode(const RenderStyle& style)
</span><span class="cx"> {
</span><span class="lines">@@ -665,9 +652,7 @@
</span><span class="cx"> updateOpacity(style);
</span><span class="cx">
</span><span class="cx"> updateFilters(style);
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- updateBackdropFilters(style);
-#endif
</del><ins>+
</ins><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> updateBlendMode(style);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -232,9 +232,6 @@
</span><span class="cx"> GraphicsLayer* layerForScrollCorner() const { return m_layerForScrollCorner.get(); }
</span><span class="cx">
</span><span class="cx"> bool canCompositeFilters() const { return m_canCompositeFilters; }
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- bool canCompositeBackdropFilters() const { return m_canCompositeBackdropFilters; }
-#endif
</del><span class="cx">
</span><span class="cx"> // Return an estimate of the backing store area (in pixels) allocated by this object's GraphicsLayers.
</span><span class="cx"> double backingStoreMemoryEstimate() const;
</span><span class="lines">@@ -282,9 +279,6 @@
</span><span class="cx"> void updateOpacity(const RenderStyle&);
</span><span class="cx"> void updateTransform(const RenderStyle&);
</span><span class="cx"> void updateFilters(const RenderStyle&);
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- void updateBackdropFilters(const RenderStyle&);
-#endif
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> void updateBlendMode(const RenderStyle&);
</span><span class="cx"> #endif
</span><span class="lines">@@ -354,9 +348,6 @@
</span><span class="cx"> bool m_usingTiledCacheLayer;
</span><span class="cx"> bool m_requiresOwnBackingStore;
</span><span class="cx"> bool m_canCompositeFilters;
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- bool m_canCompositeBackdropFilters;
-#endif
</del><span class="cx"> bool m_backgroundLayerPaintsFixedRootBackground;
</span><span class="cx">
</span><span class="cx"> static bool m_creatingPrimaryGraphicsLayer;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -2180,13 +2180,13 @@
</span><span class="cx"> || renderer.hasMask()
</span><span class="cx"> || renderer.hasReflection()
</span><span class="cx"> || renderer.hasFilter()
</span><del>- || renderer.hasBackdropFilter()
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> || requiresCompositingForScrolling(layer)
</span><span class="cx"> #endif
</span><span class="cx"> )
</span><span class="cx"> return true;
</span><del>-
</del><ins>+
+
</ins><span class="cx"> if (layer.mustCompositeForIndirectReasons()) {
</span><span class="cx"> RenderLayer::IndirectCompositingReason reason = layer.indirectCompositingReason();
</span><span class="cx"> return reason == RenderLayer::IndirectCompositingReason::Overlap
</span><span class="lines">@@ -2273,7 +2273,7 @@
</span><span class="cx"> if (renderer->hasReflection())
</span><span class="cx"> reasons |= CompositingReasonReflectionWithCompositedDescendants;
</span><span class="cx">
</span><del>- if (renderer->hasFilter() || renderer->hasBackdropFilter())
</del><ins>+ if (renderer->hasFilter())
</ins><span class="cx"> reasons |= CompositingReasonFilterWithCompositedDescendants;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="lines">@@ -2594,11 +2594,6 @@
</span><span class="cx">
</span><span class="cx"> bool RenderLayerCompositor::requiresCompositingForFilters(RenderLayerModelObject& renderer) const
</span><span class="cx"> {
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- if (renderer.hasBackdropFilter())
- return true;
-#endif
-
</del><span class="cx"> if (!(m_compositingTriggers & ChromeClient::FilterTrigger))
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> || oldStyle->filter() != newStyle.filter()
</span><span class="cx"> )
</span><span class="cx"> layer()->repaintIncludingDescendants();
</span><del>- } else if (newStyle.hasTransform() || newStyle.opacity() < 1 || newStyle.hasFilter() || newStyle.hasBackdropFilter()) {
</del><ins>+ } else if (newStyle.hasTransform() || newStyle.opacity() < 1 || newStyle.hasFilter()) {
</ins><span class="cx"> // If we don't have a layer yet, but we are going to get one because of transform or opacity,
</span><span class="cx"> // then we need to repaint the old position of the object.
</span><span class="cx"> repaint();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -638,11 +638,6 @@
</span><span class="cx"> if (rareNonInheritedData->hasFilters() != other.rareNonInheritedData->hasFilters())
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- if (rareNonInheritedData->hasBackdropFilters() != other.rareNonInheritedData->hasBackdropFilters())
- return true;
-#endif
-
</del><span class="cx"> const QuotesData* quotesDataA = rareInheritedData->quotes.get();
</span><span class="cx"> const QuotesData* quotesDataB = other.rareInheritedData->quotes.get();
</span><span class="cx"> if (!(quotesDataA == quotesDataB || (quotesDataA && quotesDataB && *quotesDataA == *quotesDataB)))
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -1117,14 +1117,6 @@
</span><span class="cx"> const FilterOperations& filter() const { return rareNonInheritedData->m_filter->m_operations; }
</span><span class="cx"> bool hasFilter() const { return !rareNonInheritedData->m_filter->m_operations.operations().isEmpty(); }
</span><span class="cx">
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- FilterOperations& mutableBackdropFilter() { return rareNonInheritedData.access()->m_backdropFilter.access()->m_operations; }
- const FilterOperations& backdropFilter() const { return rareNonInheritedData->m_backdropFilter->m_operations; }
- bool hasBackdropFilter() const { return !rareNonInheritedData->m_backdropFilter->m_operations.operations().isEmpty(); }
-#else
- bool hasBackdropFilter() const { return false; }
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> BlendMode blendMode() const { return static_cast<BlendMode>(rareNonInheritedData->m_effectiveBlendMode); }
</span><span class="cx"> void setBlendMode(BlendMode blendMode) { SET_VAR(rareNonInheritedData, m_effectiveBlendMode, blendMode); }
</span><span class="lines">@@ -1555,9 +1547,6 @@
</span><span class="cx"> void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_rubyPosition, position); }
</span><span class="cx">
</span><span class="cx"> void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.access()->m_filter, m_operations, ops); }
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- void setBackdropFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.access()->m_backdropFilter, m_operations, ops); }
-#endif
</del><span class="cx">
</span><span class="cx"> void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size); }
</span><span class="cx">
</span><span class="lines">@@ -2006,9 +1995,6 @@
</span><span class="cx"> static const Vector<StyleDashboardRegion>& noneDashboardRegions();
</span><span class="cx"> #endif
</span><span class="cx"> static const FilterOperations& initialFilter() { DEPRECATED_DEFINE_STATIC_LOCAL(FilterOperations, ops, ()); return ops; }
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- static const FilterOperations& initialBackdropFilter() { DEPRECATED_DEFINE_STATIC_LOCAL(FilterOperations, ops, ()); return ops; }
-#endif
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> static BlendMode initialBlendMode() { return BlendModeNormal; }
</span><span class="cx"> static Isolation initialIsolation() { return IsolationAuto; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -49,9 +49,6 @@
</span><span class="cx"> , m_multiCol(StyleMultiColData::create())
</span><span class="cx"> , m_transform(StyleTransformData::create())
</span><span class="cx"> , m_filter(StyleFilterData::create())
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- , m_backdropFilter(StyleFilterData::create())
-#endif
</del><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> , m_grid(StyleGridData::create())
</span><span class="cx"> , m_gridItem(StyleGridItemData::create())
</span><span class="lines">@@ -122,9 +119,6 @@
</span><span class="cx"> , m_multiCol(o.m_multiCol)
</span><span class="cx"> , m_transform(o.m_transform)
</span><span class="cx"> , m_filter(o.m_filter)
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- , m_backdropFilter(o.m_backdropFilter)
-#endif
</del><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> , m_grid(o.m_grid)
</span><span class="cx"> , m_gridItem(o.m_gridItem)
</span><span class="lines">@@ -220,9 +214,6 @@
</span><span class="cx"> && m_multiCol == o.m_multiCol
</span><span class="cx"> && m_transform == o.m_transform
</span><span class="cx"> && m_filter == o.m_filter
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- && m_backdropFilter == o.m_backdropFilter
-#endif
</del><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> && m_grid == o.m_grid
</span><span class="cx"> && m_gridItem == o.m_gridItem
</span><span class="lines">@@ -355,11 +346,4 @@
</span><span class="cx"> return m_filter.get() && !m_filter->m_operations.isEmpty();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
-bool StyleRareNonInheritedData::hasBackdropFilters() const
-{
- return m_backdropFilter.get() && !m_backdropFilter->m_operations.isEmpty();
-}
-#endif
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -94,9 +94,6 @@
</span><span class="cx"> bool animationDataEquivalent(const StyleRareNonInheritedData&) const;
</span><span class="cx"> bool transitionDataEquivalent(const StyleRareNonInheritedData&) const;
</span><span class="cx"> bool hasFilters() const;
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- bool hasBackdropFilters() const;
-#endif
</del><span class="cx"> bool hasOpacity() const { return opacity < 1; }
</span><span class="cx">
</span><span class="cx"> float opacity;
</span><span class="lines">@@ -122,9 +119,6 @@
</span><span class="cx"> DataRef<StyleMultiColData> m_multiCol; // CSS3 multicol properties
</span><span class="cx"> DataRef<StyleTransformData> m_transform; // Transform properties (rotate, scale, skew, etc.)
</span><span class="cx"> DataRef<StyleFilterData> m_filter; // Filter operations (url, sepia, blur, etc.)
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
- DataRef<StyleFilterData> m_backdropFilter; // Filter operations (url, sepia, blur, etc.)
-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> DataRef<StyleGridData> m_grid;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-11-05 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r175672.
+ https://bugs.webkit.org/show_bug.cgi?id=138455
+
+ Tries to make backdrop layers on every layer, asserts on
+ Mavericks (Requested by smfr on #webkit).
+
+ Reverted changeset:
+
+ "[filters2] Support for backdrop-filter"
+ https://bugs.webkit.org/show_bug.cgi?id=138384
+ http://trac.webkit.org/changeset/175672
+
</ins><span class="cx"> 2014-11-04 Ada Chan <adachan@apple.com>
</span><span class="cx">
</span><span class="cx"> Figure out whether a plug-in is playing audio.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerBackingStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -348,7 +348,6 @@
</span><span class="cx"> case PlatformCALayer::LayerTypeRootLayer:
</span><span class="cx"> case PlatformCALayer::LayerTypeAVPlayerLayer:
</span><span class="cx"> case PlatformCALayer::LayerTypeWebGLLayer:
</span><del>- case PlatformCALayer::LayerTypeBackdropLayer:
</del><span class="cx"> case PlatformCALayer::LayerTypeCustom:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -1180,9 +1180,6 @@
</span><span class="cx"> case PlatformCALayer::LayerTypeRootLayer:
</span><span class="cx"> ts << "root-layer";
</span><span class="cx"> break;
</span><del>- case PlatformCALayer::LayerTypeBackdropLayer:
- ts << "backdrop-layer";
- break;
</del><span class="cx"> case PlatformCALayer::LayerTypeAVPlayerLayer:
</span><span class="cx"> ts << "av-player-layer (context-id " << createdLayer.hostingContextID << ")";
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosRemoteLayerTreeHostIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/RemoteLayerTreeHostIOS.mm (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/RemoteLayerTreeHostIOS.mm 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebKit2/UIProcess/ios/RemoteLayerTreeHostIOS.mm 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -38,9 +38,6 @@
</span><span class="cx"> - (void)setContextId:(uint32_t)contextID;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@interface CABackdropLayer : CALayer
-@end
-
</del><span class="cx"> @interface UIView (WKHitTesting)
</span><span class="cx"> - (UIView *)_findDescendantViewAtPoint:(CGPoint)point withEvent:(UIEvent *)event;
</span><span class="cx"> @end
</span><span class="lines">@@ -107,17 +104,6 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@interface WKBackdropView : WKCompositingView
-@end
-
-@implementation WKBackdropView
-+ (Class)layerClass
-{
- return [CABackdropLayer self];
-}
-
-@end
-
</del><span class="cx"> @interface WKRemoteView : WKCompositingView
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -165,9 +151,6 @@
</span><span class="cx"> } else
</span><span class="cx"> view = adoptNS([[WKCompositingView alloc] init]);
</span><span class="cx"> break;
</span><del>- case PlatformCALayer::LayerTypeBackdropLayer:
- view = adoptNS([[WKBackdropView alloc] init]);
- break;
</del><span class="cx"> case PlatformCALayer::LayerTypeTransformLayer:
</span><span class="cx"> view = adoptNS([[WKTransformView alloc] init]);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeHostmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -41,11 +41,6 @@
</span><span class="cx"> #import <UIKit/UIView.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(FILTERS_LEVEL_2)
-@interface CABackdropLayer : CALayer
-@end
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -227,14 +222,6 @@
</span><span class="cx"> case PlatformCALayer::LayerTypeTransformLayer:
</span><span class="cx"> layer = adoptNS([[CATransformLayer alloc] init]);
</span><span class="cx"> break;
</span><del>- case PlatformCALayer::LayerTypeBackdropLayer:
-#if ENABLE(FILTERS_LEVEL_2)
- layer = adoptNS([[CABackdropLayer alloc] init]);
-#else
- ASSERT_NOT_REACHED();
- layer = adoptNS([[CALayer alloc] init]);
-#endif
- break;
</del><span class="cx"> case PlatformCALayer::LayerTypeCustom:
</span><span class="cx"> case PlatformCALayer::LayerTypeAVPlayerLayer:
</span><span class="cx"> case PlatformCALayer::LayerTypeWebGLLayer:
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (175686 => 175687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-11-06 07:21:54 UTC (rev 175686)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-11-06 07:43:41 UTC (rev 175687)
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> return static_cast<CompositingTriggerFlags>(
</span><span class="cx"> ThreeDTransformTrigger |
</span><span class="cx"> VideoTrigger |
</span><del>- PluginTrigger|
</del><ins>+ PluginTrigger|
</ins><span class="cx"> CanvasTrigger |
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> AnimatedOpacityTrigger | // Allow opacity animations to trigger compositing mode for iPhone: <rdar://problem/7830677>
</span></span></pre>
</div>
</div>
</body>
</html>