Index: WebCore/rendering/RenderLayer.cpp |
=================================================================== |
--- WebCore/rendering/RenderLayer.cpp (revision 148420) |
+++ WebCore/rendering/RenderLayer.cpp (working copy) |
@@ -173,9 +173,7 @@ |
#if ENABLE(CSS_FILTERS) |
, m_hasFilterInfo(false) |
#endif |
-#if ENABLE(CSS_COMPOSITING) |
, m_blendMode(BlendModeNormal) |
-#endif |
, m_renderer(renderer) |
, m_parent(0) |
, m_previous(0) |
@@ -789,7 +787,6 @@ |
positionOverflowControls(toIntSize(roundedIntPoint(offsetFromRoot))); |
} |
-#if ENABLE(CSS_COMPOSITING) |
void RenderLayer::updateBlendMode() |
{ |
BlendMode newBlendMode = renderer()->style()->blendMode(); |
@@ -799,7 +796,6 @@ |
backing()->setBlendMode(newBlendMode); |
} |
} |
-#endif |
void RenderLayer::updateTransform() |
{ |
@@ -5369,9 +5365,7 @@ |
#if ENABLE(CSS_FILTERS) |
updateOrRemoveFilterEffectRenderer(); |
#endif |
-#if ENABLE(CSS_COMPOSITING) |
backing()->setBlendMode(m_blendMode); |
-#endif |
} |
return m_backing.get(); |
} |
@@ -5711,9 +5705,7 @@ |
#if ENABLE(CSS_FILTERS) |
&& !renderer()->hasFilter() |
#endif |
-#if ENABLE(CSS_COMPOSITING) |
&& !renderer()->hasBlendMode() |
-#endif |
&& !isTransparent() |
&& !needsCompositedScrolling() |
#if ENABLE(CSS_EXCLUSIONS) |
@@ -6033,9 +6025,7 @@ |
updateDescendantDependentFlags(); |
updateTransform(); |
-#if ENABLE(CSS_COMPOSITING) |
updateBlendMode(); |
-#endif |
bool didPaintWithFilters = false; |