| Index: WebCore/rendering/style/StyleRareNonInheritedData.cpp
|
| ===================================================================
|
| --- WebCore/rendering/style/StyleRareNonInheritedData.cpp (revision 148420)
|
| +++ WebCore/rendering/style/StyleRareNonInheritedData.cpp (working copy)
|
| @@ -82,9 +82,7 @@
|
| , m_wrapThrough(RenderStyle::initialWrapThrough())
|
| , m_runningAcceleratedAnimation(false)
|
| , m_hasAspectRatio(false)
|
| -#if ENABLE(CSS_COMPOSITING)
|
| , m_effectiveBlendMode(RenderStyle::initialBlendMode())
|
| -#endif
|
| {
|
| m_maskBoxImage.setMaskDefaults();
|
| }
|
| @@ -161,9 +159,7 @@
|
| , 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
|
| {
|
| }
|
|
|
| @@ -242,9 +238,7 @@
|
| && 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;
|
| }
|
|
|
|
|