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

Source/core/rendering/style/RenderStyle.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 591 matching lines @@
 
             // FIXME: We would like to use SimplifiedLayout for relative positioning, but we can't quite do that yet.
             // We need to make sure SimplifiedLayout can operate correctly on RenderInlines (we will need
             // to add a selfNeedsSimplifiedLayout bit in order to not get confused and taint every line).
             return StyleDifferenceLayout;
         } else if (m_box->zIndex() != other->m_box->zIndex() || m_box->hasAutoZIndex() != other->m_box->hasAutoZIndex()
                  || visual->clip != other->visual->clip || visual->hasClip != other->visual->hasClip)
             return StyleDifferenceRepaintLayer;
     }
     
-#if ENABLE(CSS_COMPOSITING)
-    if (rareNonInheritedData->m_effectiveBlendMode != other->rareNonInheritedData->m_effectiveBlendMode)
-        return StyleDifferenceRepaintLayer;
-#endif
+    if (RuntimeEnabledFeatures::cssCompositingEnabled())
+        if (rareNonInheritedData->m_effectiveBlendMode != other->rareNonInheritedData->m_effectiveBlendMode)
+            return StyleDifferenceRepaintLayer;
 
     if (rareNonInheritedData->opacity != other->rareNonInheritedData->opacity) {
         // Don't return early here; instead take note of the type of change,
         // and deal with it when looking at compositing.
         changedContextSensitiveProperties |= ContextSensitivePropertyOpacity;
     }
 
     if (rareNonInheritedData->m_filter.get() != other->rareNonInheritedData->m_filter.get()
         && *rareNonInheritedData->m_filter.get() != *other->rareNonInheritedData->m_filter.get()) {
         // Don't return early here; instead take note of the type of change,
@@ skipping 160 matching lines @@
 
 void RenderStyle::setContent(QuoteType quote, bool add)
 {
     if (add) {
         appendContent(ContentData::create(quote));
         return;
     }
 
     rareNonInheritedData.access()->m_content = ContentData::create(quote);
 }
-    
+
+BlendMode RenderStyle::blendMode() const
+{
+    if (RuntimeEnabledFeatures::cssCompositingEnabled())
+        return static_cast<BlendMode>(rareNonInheritedData->m_effectiveBlendMode);
+    return BlendModeNormal;
+}
+
+void RenderStyle::setBlendMode(BlendMode v)
+{
+    if (RuntimeEnabledFeatures::cssCompositingEnabled())
+        rareNonInheritedData.access()->m_effectiveBlendMode = v;
+}
+
+bool RenderStyle::hasBlendMode() const
+{
+    if (RuntimeEnabledFeatures::cssCompositingEnabled())
+        return static_cast<BlendMode>(rareNonInheritedData->m_effectiveBlendMode) != BlendModeNormal;
+    return false;
+}
+
 inline bool requireTransformOrigin(const Vector<RefPtr<TransformOperation> >& transformOperations, RenderStyle::ApplyTransformOrigin applyOrigin)
 {
     // transform-origin brackets the transform with translate operations.
     // Optimize for the case where the only transform is a translation, since the transform-origin is irrelevant
     // in that case.
     if (applyOrigin != RenderStyle::IncludeTransformOrigin)
         return false;
 
     unsigned size = transformOperations.size();
     for (unsigned i = 0; i < size; ++i) {
@@ skipping 776 matching lines @@
     info.addMember(inherited, "inherited");
     info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles");
 #if ENABLE(SVG)
     info.addMember(m_svgStyle, "svgStyle");
 #endif
     info.addMember(inherited_flags, "inherited_flags");
     info.addMember(noninherited_flags, "noninherited_flags");
 }
 
 } // namespace WebCore