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

Source/core/rendering/RenderLayer.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 150 matching lines @@
     , m_isPaginated(false)
     , m_3DTransformedDescendantStatusDirty(true)
     , m_has3DTransformedDescendant(false)
     , m_containsDirtyOverlayScrollbars(false)
     , m_updatingMarqueePosition(false)
 #if !ASSERT_DISABLED
     , m_layerListMutationAllowed(true)
 #endif
     , m_canSkipRepaintRectsUpdateOnScroll(renderer->isTableCell())
     , m_hasFilterInfo(false)
-#if ENABLE(CSS_COMPOSITING)
     , m_blendMode(BlendModeNormal)
-#endif
     , m_renderer(renderer)
     , m_parent(0)
     , m_previous(0)
     , m_next(0)
     , m_first(0)
     , m_last(0)
     , m_staticInlinePosition(0)
     , m_staticBlockPosition(0)
     , m_reflection(0)
     , m_scrollCorner(0)
@@ skipping 695 matching lines @@
 
     RenderGeometryMap geometryMap(UseTransforms);
     RenderView* view = renderer()->view();
     if (this != view->layer() && parent())
         geometryMap.pushMappingsToAncestor(parent(), 0);
 
     LayoutPoint offsetFromRoot = LayoutPoint(geometryMap.absolutePoint(FloatPoint()));
     positionOverflowControls(toIntSize(roundedIntPoint(offsetFromRoot)));
 }
 
-#if ENABLE(CSS_COMPOSITING)
+bool RenderLayer::hasBlendMode() const
+{
+    return RuntimeEnabledFeatures::cssCompositingEnabled() && renderer()->hasBlendMode();
+}
+
 void RenderLayer::updateBlendMode()
 {
+    if (!RuntimeEnabledFeatures::cssCompositingEnabled())
+        return;
+
     BlendMode newBlendMode = renderer()->style()->blendMode();
     if (newBlendMode != m_blendMode) {
         m_blendMode = newBlendMode;
         if (backing())
             backing()->setBlendMode(newBlendMode);
     }
 }
-#endif
 
 void RenderLayer::updateTransform()
 {
     // hasTransform() on the renderer is also true when there is transform-style: preserve-3d or perspective set,
     // so check style too.
     bool hasTransform = renderer()->hasTransform() && renderer()->style()->hasTransform();
     bool had3DTransform = has3DTransform();
 
     bool hadTransform = m_transform;
     if (hasTransform != hadTransform) {
@@ skipping 4575 matching lines @@
     }
 }
 
 RenderLayerBacking* RenderLayer::ensureBacking()
 {
     if (!m_backing) {
         m_backing = adoptPtr(new RenderLayerBacking(this));
         compositor()->layerBecameComposited(this);
 
         updateOrRemoveFilterEffectRenderer();
-#if ENABLE(CSS_COMPOSITING)
-        backing()->setBlendMode(m_blendMode);
-#endif
+
+        if (RuntimeEnabledFeatures::cssCompositingEnabled())
+            backing()->setBlendMode(m_blendMode);
     }
     return m_backing.get();
 }
 
 void RenderLayer::clearBacking(bool layerBeingDestroyed)
 {
     if (m_backing && !renderer()->documentBeingDestroyed())
         compositor()->layerBecameNonComposited(this);
     m_backing.clear();
 
@@ skipping 333 matching lines @@
                 || renderer()->hasMask()
                 || renderer()->isCanvas()
                 || renderer()->isVideo()
                 || renderer()->isEmbeddedObject()
                 || renderer()->isRenderIFrame()
                 || (renderer()->style()->specifiesColumns() && !isRootLayer()))
             && !renderer()->isPositioned()
             && !renderer()->hasTransform()
             && !renderer()->hasClipPath()
             && !renderer()->hasFilter()
-#if ENABLE(CSS_COMPOSITING)
             && !renderer()->hasBlendMode()
-#endif
             && !isTransparent()
             && !needsCompositedScrolling()
             && !renderer()->isFloatingWithShapeOutside()
             ;
 }
 
 void RenderLayer::updateIsNormalFlowOnly()
 {
     bool isNormalFlowOnly = shouldBeNormalFlowOnly();
     if (isNormalFlowOnly == m_isNormalFlowOnly)
@@ skipping 317 matching lines @@
     if (m_hBar)
         m_hBar->styleChanged();
     if (m_vBar)
         m_vBar->styleChanged();
     
     updateScrollCornerStyle();
     updateResizerStyle();
 
     updateDescendantDependentFlags();
     updateTransform();
-#if ENABLE(CSS_COMPOSITING)
-    updateBlendMode();
-#endif
+
+    if (RuntimeEnabledFeatures::cssCompositingEnabled())
+        updateBlendMode();
 
     bool didPaintWithFilters = false;
 
     if (paintsWithFilters())
         didPaintWithFilters = true;
     updateFilters(oldStyle, renderer()->style());
 
     const RenderStyle* newStyle = renderer()->style();
     if (compositor()->updateLayerCompositingState(this)
         || needsCompositingLayersRebuiltForClip(oldStyle, newStyle)
@@ skipping 282 matching lines @@
     }
 }
 
 void showLayerTree(const WebCore::RenderObject* renderer)
 {
     if (!renderer)
         return;
     showLayerTree(renderer->enclosingLayer());
 }
 #endif