Remove the CSS_COMPOSITING define, leaving the implementation under the runtime flag, since runtime…

Source/core/rendering/RenderLayerBacking.cpp

 /*
  * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 181 matching lines @@
 #endif
     
     m_graphicsLayer = createGraphicsLayer(layerName);
 
     if (m_isMainFrameRenderViewLayer)
         m_graphicsLayer->setContentsOpaque(true);
 
     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()
 {
     if (m_graphicsLayer)
         m_graphicsLayer->removeFromParent();
 
     m_ancestorClippingLayer = nullptr;
     m_contentsContainmentLayer = nullptr;
     m_graphicsLayer = nullptr;
@@ skipping 40 matching lines @@
         //
         // Similarly, if filters used to be painted in the compositor and are now painted in software, we need to:
         // (1) Create a FilterEffectRenderer.
         // (2) Repaint the layer contents to apply a software filter because the compositor won't apply it.
         //
         m_owningLayer->updateOrRemoveFilterEffectRenderer();
         setContentsNeedDisplay();
     }
 }
 
-#if ENABLE(CSS_COMPOSITING)
 void RenderLayerBacking::updateLayerBlendMode(const RenderStyle*)
 {
 }
-#endif
 
 static bool hasNonZeroTransformOrigin(const RenderObject* renderer)
 {
     RenderStyle* style = renderer->style();
     return (style->transformOriginX().type() == Fixed && style->transformOriginX().value())
         || (style->transformOriginY().type() == Fixed && style->transformOriginY().value());
 }
 
 static bool layerOrAncestorIsTransformedOrUsingCompositedScrolling(RenderLayer* layer)
 {
@@ skipping 187 matching lines @@
 
     // Set transform property, if it is not animating. We have to do this here because the transform
     // is affected by the layer dimensions.
     if (!renderer()->animation()->isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyWebkitTransform))
         updateTransform(renderer()->style());
 
     // Set opacity, if it is not animating.
     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();
     
     m_owningLayer->updateDescendantDependentFlags();
 
     // m_graphicsLayer is the corresponding GraphicsLayer for this RenderLayer and its non-compositing
     // descendants. So, the visibility flag for m_graphicsLayer should be true if there are any
     // non-compositing visible layers.
     m_graphicsLayer->setContentsVisible(m_owningLayer->hasVisibleContent() || hasVisibleNonCompositingDescendantLayers());
 
@@ skipping 1030 matching lines @@
     m_requiresOwnBackingStore = requiresOwnBacking;
 
     // This affects the answer to paintsIntoCompositedAncestor(), which in turn affects
     // cached clip rects, so when it changes we have to clear clip rects on descendants.
     m_owningLayer->clearClipRectsIncludingDescendants(PaintingClipRects);
     m_owningLayer->computeRepaintRectsIncludingDescendants();
     
     compositor()->repaintInCompositedAncestor(m_owningLayer, compositedBounds());
 }
 
-#if ENABLE(CSS_COMPOSITING)
 void RenderLayerBacking::setBlendMode(BlendMode)
 {
 }
-#endif
 
 void RenderLayerBacking::setContentsNeedDisplay()
 {
     ASSERT(!paintsIntoCompositedAncestor());
     
     if (m_graphicsLayer && m_graphicsLayer->drawsContent())
         m_graphicsLayer->setNeedsDisplay();
     
     if (m_foregroundLayer && m_foregroundLayer->drawsContent())
         m_foregroundLayer->setNeedsDisplay();
@@ skipping 428 matching lines @@
     info.addMember(m_childContainmentLayer, "childContainmentLayer");
     info.addMember(m_maskLayer, "maskLayer");
     info.addMember(m_layerForHorizontalScrollbar, "layerForHorizontalScrollbar");
     info.addMember(m_layerForVerticalScrollbar, "layerForVerticalScrollbar");
     info.addMember(m_layerForScrollCorner, "layerForScrollCorner");
     info.addMember(m_scrollingLayer, "scrollingLayer");
     info.addMember(m_scrollingContentsLayer, "scrollingContentsLayer");
 }
 
 } // namespace WebCore