Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1349)

Unified Diff: WebCore/rendering/RenderLayer.cpp

Issue 14295007: Remove the CSS_COMPOSITING define, the CSS blending and compositing (Closed) Base URL: http://src.chromium.org/blink/trunk/Source/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « WebCore/rendering/RenderLayer.h ('k') | WebCore/rendering/RenderLayerBacking.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « WebCore/rendering/RenderLayer.h ('k') | WebCore/rendering/RenderLayerBacking.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698