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

Unified Diff: Source/core/rendering/style/StyleRareNonInheritedData.cpp

Issue 15012010: Remove the CSS_COMPOSITING define, leaving the implementation under the runtime flag, since runtime… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: removed bogus test Created 7 years, 7 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 | « Source/core/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/StyleRareNonInheritedData.cpp
diff --git a/Source/core/rendering/style/StyleRareNonInheritedData.cpp b/Source/core/rendering/style/StyleRareNonInheritedData.cpp
index ace18a4d6c6ae7feeb7a2373daaec66197a55b42..1880b7bd767da486e4fb3f946b6453366c8f01fc 100644
--- a/Source/core/rendering/style/StyleRareNonInheritedData.cpp
+++ b/Source/core/rendering/style/StyleRareNonInheritedData.cpp
@@ -82,9 +82,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData()
, m_wrapThrough(RenderStyle::initialWrapThrough())
, m_runningAcceleratedAnimation(false)
, m_hasAspectRatio(false)
-#if ENABLE(CSS_COMPOSITING)
, m_effectiveBlendMode(RenderStyle::initialBlendMode())
-#endif
{
m_maskBoxImage.setMaskDefaults();
}
@@ -159,9 +157,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
, 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
{
}
@@ -238,9 +234,7 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
&& 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 | « Source/core/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698