Index: WebCore/rendering/style/RenderStyle.h |
=================================================================== |
--- WebCore/rendering/style/RenderStyle.h (revision 148420) |
+++ WebCore/rendering/style/RenderStyle.h (working copy) |
@@ -946,13 +946,9 @@ |
bool hasFilter() const { return false; } |
#endif |
-#if ENABLE(CSS_COMPOSITING) |
BlendMode blendMode() const { return static_cast<BlendMode>(rareNonInheritedData->m_effectiveBlendMode); } |
void setBlendMode(BlendMode v) { rareNonInheritedData.access()->m_effectiveBlendMode = v; } |
bool hasBlendMode() const { return static_cast<BlendMode>(rareNonInheritedData->m_effectiveBlendMode) != BlendModeNormal; } |
-#else |
- bool hasBlendMode() const { return false; } |
-#endif |
#if USE(RTL_SCROLLBAR) |
bool shouldPlaceBlockDirectionScrollbarOnLogicalLeft() const { return !isLeftToRightDirection() && isHorizontalWritingMode(); } |
@@ -1709,9 +1705,7 @@ |
#if ENABLE(CSS_FILTERS) |
static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterOperations, ops, ()); return ops; } |
#endif |
-#if ENABLE(CSS_COMPOSITING) |
static BlendMode initialBlendMode() { return BlendModeNormal; } |
-#endif |
private: |
void setVisitedLinkColor(const Color&); |
void setVisitedLinkBackgroundColor(const Color& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBackgroundColor, v); } |