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

Unified Diff: WebCore/rendering/style/StyleRareNonInheritedData.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/style/StyleRareNonInheritedData.h ('k') | WebKit/chromium/features.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « WebCore/rendering/style/StyleRareNonInheritedData.h ('k') | WebKit/chromium/features.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698