| Index: Source/core/rendering/style/RenderStyle.h
|
| diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
|
| index d9fc2c877596b52a597348ebcff05fce037958ba..bf32e1a423b9782ae22d83a68d3abd256071c40a 100644
|
| --- a/Source/core/rendering/style/RenderStyle.h
|
| +++ b/Source/core/rendering/style/RenderStyle.h
|
| @@ -912,13 +912,9 @@ public:
|
| const FilterOperations& filter() const { return rareNonInheritedData->m_filter->m_operations; }
|
| bool hasFilter() const { return !rareNonInheritedData->m_filter->m_operations.operations().isEmpty(); }
|
|
|
| -#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
|
| + BlendMode blendMode() const;
|
| + void setBlendMode(BlendMode v);
|
| + bool hasBlendMode() const;
|
|
|
| bool shouldPlaceBlockDirectionScrollbarOnLogicalLeft() const { return !isLeftToRightDirection() && isHorizontalWritingMode(); }
|
|
|
| @@ -1652,9 +1648,7 @@ public:
|
| static bool initialUseTouchOverflowScrolling() { return false; }
|
| #endif
|
| static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterOperations, ops, ()); return ops; }
|
| -#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); }
|
|
|