Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1801)

Unified Diff: Source/core/rendering/RenderLayerBacking.cpp

Issue 15012010: Remove the CSS_COMPOSITING define, leaving the implementation under the runtime flag, since runtime… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: removed bogus test Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderLayerBacking.h ('k') | Source/core/rendering/RenderLayerCompositor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayerBacking.cpp
diff --git a/Source/core/rendering/RenderLayerBacking.cpp b/Source/core/rendering/RenderLayerBacking.cpp
index dbe84e91fbf72731dacbc09c8bddef7be9967d5d..5adb079a08a67a56bc05c74e35f550ae94509c76 100644
--- a/Source/core/rendering/RenderLayerBacking.cpp
+++ b/Source/core/rendering/RenderLayerBacking.cpp
@@ -199,9 +199,9 @@ void RenderLayerBacking::createPrimaryGraphicsLayer()
updateOpacity(renderer()->style());
updateTransform(renderer()->style());
updateFilters(renderer()->style());
-#if ENABLE(CSS_COMPOSITING)
- updateLayerBlendMode(renderer()->style());
-#endif
+
+ if (RuntimeEnabledFeatures::cssCompositingEnabled())
+ updateLayerBlendMode(renderer()->style());
}
void RenderLayerBacking::destroyGraphicsLayers()
@@ -262,11 +262,9 @@ void RenderLayerBacking::updateFilters(const RenderStyle* style)
}
}
-#if ENABLE(CSS_COMPOSITING)
void RenderLayerBacking::updateLayerBlendMode(const RenderStyle*)
{
}
-#endif
static bool hasNonZeroTransformOrigin(const RenderObject* renderer)
{
@@ -474,9 +472,8 @@ void RenderLayerBacking::updateGraphicsLayerGeometry()
if (!renderer()->animation()->isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyOpacity))
updateOpacity(renderer()->style());
-#if ENABLE(CSS_COMPOSITING)
- updateLayerBlendMode(renderer()->style());
-#endif
+ if (RuntimeEnabledFeatures::cssCompositingEnabled())
+ updateLayerBlendMode(renderer()->style());
bool isSimpleContainer = isSimpleContainerCompositingLayer();
@@ -1527,11 +1524,9 @@ void RenderLayerBacking::setRequiresOwnBackingStore(bool requiresOwnBacking)
compositor()->repaintInCompositedAncestor(m_owningLayer, compositedBounds());
}
-#if ENABLE(CSS_COMPOSITING)
void RenderLayerBacking::setBlendMode(BlendMode)
{
}
-#endif
void RenderLayerBacking::setContentsNeedDisplay()
{
« no previous file with comments | « Source/core/rendering/RenderLayerBacking.h ('k') | Source/core/rendering/RenderLayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698