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

Unified Diff: Source/core/rendering/RenderLayer.h

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/page/RuntimeEnabledFeatures.in ('k') | Source/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayer.h
diff --git a/Source/core/rendering/RenderLayer.h b/Source/core/rendering/RenderLayer.h
index 32c140fd383a0941629d87e9044627cbf42ed8b1..85053caba376fcfba6e683ea12ac6930530c8342 100644
--- a/Source/core/rendering/RenderLayer.h
+++ b/Source/core/rendering/RenderLayer.h
@@ -480,10 +480,8 @@ public:
RenderLayer* enclosingPaginationLayer() const { return m_enclosingPaginationLayer; }
void updateTransform();
-
-#if ENABLE(CSS_COMPOSITING)
+
void updateBlendMode();
-#endif
const LayoutSize& paintOffset() const { return m_paintOffset; }
@@ -733,11 +731,7 @@ public:
virtual void filterNeedsRepaint();
bool hasFilter() const { return renderer()->hasFilter(); }
-#if ENABLE(CSS_COMPOSITING)
- bool hasBlendMode() const { return renderer()->hasBlendMode(); }
-#else
- bool hasBlendMode() const { return false; }
-#endif
+ bool hasBlendMode() const;
// Overloaded new operator. Derived classes must override operator new
// in order to allocate out of the RenderArena.
@@ -1185,9 +1179,7 @@ protected:
bool m_hasFilterInfo : 1;
-#if ENABLE(CSS_COMPOSITING)
BlendMode m_blendMode;
-#endif
RenderLayerModelObject* m_renderer;
« no previous file with comments | « Source/core/page/RuntimeEnabledFeatures.in ('k') | Source/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698