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

Source/core/rendering/style/StyleRareNonInheritedData.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 64 matching lines @@
     , m_appearance(RenderStyle::initialAppearance())
     , m_borderFit(RenderStyle::initialBorderFit())
     , m_textCombine(RenderStyle::initialTextCombine())
 #if ENABLE(CSS3_TEXT)
     , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle())
 #endif // CSS3_TEXT
     , m_wrapFlow(RenderStyle::initialWrapFlow())
     , m_wrapThrough(RenderStyle::initialWrapThrough())
     , m_runningAcceleratedAnimation(false)
     , m_hasAspectRatio(false)
-#if ENABLE(CSS_COMPOSITING)
     , m_effectiveBlendMode(RenderStyle::initialBlendMode())
-#endif
 {
     m_maskBoxImage.setMaskDefaults();
 }
 
 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInheritedData& o)
     : RefCounted<StyleRareNonInheritedData>()
     , opacity(o.opacity)
     , m_aspectRatioDenominator(o.m_aspectRatioDenominator)
     , m_aspectRatioNumerator(o.m_aspectRatioNumerator)
     , m_perspective(o.m_perspective)
@@ skipping 54 matching lines @@
     , m_appearance(o.m_appearance)
     , m_borderFit(o.m_borderFit)
     , m_textCombine(o.m_textCombine)
 #if ENABLE(CSS3_TEXT)
     , m_textDecorationStyle(o.m_textDecorationStyle)
 #endif // CSS3_TEXT
     , m_wrapFlow(o.m_wrapFlow)
     , m_wrapThrough(o.m_wrapThrough)
     , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation)
     , m_hasAspectRatio(o.m_hasAspectRatio)
-#if ENABLE(CSS_COMPOSITING)
     , m_effectiveBlendMode(o.m_effectiveBlendMode)
-#endif
 {
 }
 
 StyleRareNonInheritedData::~StyleRareNonInheritedData()
 {
 }
 
 bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) const
 {
     return opacity == o.opacity
@@ skipping 56 matching lines @@
         && marginAfterCollapse == o.marginAfterCollapse
         && m_appearance == o.m_appearance
         && m_borderFit == o.m_borderFit
         && m_textCombine == o.m_textCombine
 #if ENABLE(CSS3_TEXT)
         && m_textDecorationStyle == o.m_textDecorationStyle
 #endif // CSS3_TEXT
         && m_wrapFlow == o.m_wrapFlow
         && m_wrapThrough == o.m_wrapThrough
         && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation
-#if ENABLE(CSS_COMPOSITING)
         && m_effectiveBlendMode == o.m_effectiveBlendMode
-#endif
         && m_hasAspectRatio == o.m_hasAspectRatio;
 }
 
 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInheritedData& o) const
 {
     ContentData* a = m_content.get();
     ContentData* b = o.m_content.get();
 
     while (a && b && *a == *b) {
         a = a->next();
@@ skipping 75 matching lines @@
     info.addMember(m_regionThread, "regionThread");
 
     info.ignoreMember(m_perspectiveOriginX);
     info.ignoreMember(m_perspectiveOriginY);
     info.ignoreMember(m_pageSize);
     info.ignoreMember(m_shapeMargin);
     info.ignoreMember(m_shapePadding);
 }
 
 } // namespace WebCore