Index: Source/core/style/ComputedStyle.h |
diff --git a/Source/core/style/ComputedStyle.h b/Source/core/style/ComputedStyle.h |
index e8f1dd447b7c3da63b8cea7aa1f136bd3b89779c..0cf7e65eebd8b7054e17e42887f94e3d30ab7f4e 100644 |
--- a/Source/core/style/ComputedStyle.h |
+++ b/Source/core/style/ComputedStyle.h |
@@ -922,12 +922,14 @@ public: |
bool hasCurrentOpacityAnimation() const { return rareNonInheritedData->m_hasCurrentOpacityAnimation; } |
bool hasCurrentTransformAnimation() const { return rareNonInheritedData->m_hasCurrentTransformAnimation; } |
bool hasCurrentFilterAnimation() const { return rareNonInheritedData->m_hasCurrentFilterAnimation; } |
- bool shouldCompositeForCurrentAnimations() const { return hasCurrentOpacityAnimation() || hasCurrentTransformAnimation() || hasCurrentFilterAnimation(); } |
+ bool hasCurrentBackdropFilterAnimation() const { return rareNonInheritedData->m_hasCurrentBackdropFilterAnimation; } |
+ bool shouldCompositeForCurrentAnimations() const { return hasCurrentOpacityAnimation() || hasCurrentTransformAnimation() || hasCurrentFilterAnimation() || hasCurrentBackdropFilterAnimation(); } |
bool isRunningOpacityAnimationOnCompositor() const { return rareNonInheritedData->m_runningOpacityAnimationOnCompositor; } |
bool isRunningTransformAnimationOnCompositor() const { return rareNonInheritedData->m_runningTransformAnimationOnCompositor; } |
bool isRunningFilterAnimationOnCompositor() const { return rareNonInheritedData->m_runningFilterAnimationOnCompositor; } |
- bool isRunningAnimationOnCompositor() const { return isRunningOpacityAnimationOnCompositor() || isRunningTransformAnimationOnCompositor() || isRunningFilterAnimationOnCompositor(); } |
+ bool isRunningBackdropFilterAnimationOnCompositor() const { return rareNonInheritedData->m_runningBackdropFilterAnimationOnCompositor; } |
+ bool isRunningAnimationOnCompositor() const { return isRunningOpacityAnimationOnCompositor() || isRunningTransformAnimationOnCompositor() || isRunningFilterAnimationOnCompositor() || isRunningBackdropFilterAnimationOnCompositor(); } |
LineBoxContain lineBoxContain() const { return rareInheritedData->m_lineBoxContain; } |
const LineClampValue& lineClamp() const { return rareNonInheritedData->lineClamp; } |
@@ -947,6 +949,10 @@ public: |
const FilterOperations& filter() const { return rareNonInheritedData->m_filter->m_operations; } |
bool hasFilter() const { return !rareNonInheritedData->m_filter->m_operations.operations().isEmpty(); } |
+ FilterOperations& mutableBackdropFilter() { return rareNonInheritedData.access()->m_backdropFilter.access()->m_operations; } |
+ const FilterOperations& backdropFilter() const { return rareNonInheritedData->m_backdropFilter->m_operations; } |
+ bool hasBackdropFilter() const { return !rareNonInheritedData->m_backdropFilter->m_operations.operations().isEmpty(); } |
+ |
WebBlendMode blendMode() const { return static_cast<WebBlendMode>(rareNonInheritedData->m_effectiveBlendMode); } |
void setBlendMode(WebBlendMode v) { rareNonInheritedData.access()->m_effectiveBlendMode = v; } |
bool hasBlendMode() const { return blendMode() != WebBlendModeNormal; } |
@@ -1378,6 +1384,7 @@ public: |
void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_rubyPosition, position); } |
void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.access()->m_filter, m_operations, ops); } |
+ void setBackdropFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.access()->m_backdropFilter, m_operations, ops); } |
void setTabSize(TabSize size) { SET_VAR(rareInheritedData, m_tabSize, size); } |
@@ -1404,10 +1411,12 @@ public: |
void setHasCurrentOpacityAnimation(bool b = true) { SET_VAR(rareNonInheritedData, m_hasCurrentOpacityAnimation, b); } |
void setHasCurrentTransformAnimation(bool b = true) { SET_VAR(rareNonInheritedData, m_hasCurrentTransformAnimation, b); } |
void setHasCurrentFilterAnimation(bool b = true) { SET_VAR(rareNonInheritedData, m_hasCurrentFilterAnimation, b); } |
+ void setHasCurrentBackdropFilterAnimation(bool b = true) { SET_VAR(rareNonInheritedData, m_hasCurrentBackdropFilterAnimation, b); } |
void setIsRunningOpacityAnimationOnCompositor(bool b = true) { SET_VAR(rareNonInheritedData, m_runningOpacityAnimationOnCompositor, b); } |
void setIsRunningTransformAnimationOnCompositor(bool b = true) { SET_VAR(rareNonInheritedData, m_runningTransformAnimationOnCompositor, b); } |
void setIsRunningFilterAnimationOnCompositor(bool b = true) { SET_VAR(rareNonInheritedData, m_runningFilterAnimationOnCompositor, b); } |
+ void setIsRunningBackdropFilterAnimationOnCompositor(bool b = true) { SET_VAR(rareNonInheritedData, m_runningBackdropFilterAnimationOnCompositor, b); } |
void setLineBoxContain(LineBoxContain c) { SET_VAR(rareInheritedData, m_lineBoxContain, c); } |
void setLineClamp(LineClampValue c) { SET_VAR(rareNonInheritedData, lineClamp, c); } |
@@ -1747,8 +1756,10 @@ public: |
static Color initialTapHighlightColor(); |
#if ENABLE(OILPAN) |
static const FilterOperations& initialFilter(); |
+ static const FilterOperations& initialBackdropFilter(); |
#else |
static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterOperations, ops, ()); return ops; } |
+ static const FilterOperations& initialBackdropFilter() { DEFINE_STATIC_LOCAL(FilterOperations, ops, ()); return ops; } |
#endif |
static WebBlendMode initialBlendMode() { return WebBlendModeNormal; } |
static EIsolation initialIsolation() { return IsolationAuto; } |