| Index: Source/core/style/ComputedStyle.h
|
| diff --git a/Source/core/style/ComputedStyle.h b/Source/core/style/ComputedStyle.h
|
| index 117fb60cf668787863416156eacd38432b71f153..e8f1dd447b7c3da63b8cea7aa1f136bd3b89779c 100644
|
| --- a/Source/core/style/ComputedStyle.h
|
| +++ b/Source/core/style/ComputedStyle.h
|
| @@ -78,7 +78,6 @@
|
| #include "platform/text/TextRun.h"
|
| #include "platform/text/UnicodeBidi.h"
|
| #include "platform/transforms/TransformOperations.h"
|
| -#include "public/platform/WebScrollBlocksOn.h"
|
| #include "wtf/Forward.h"
|
| #include "wtf/OwnPtr.h"
|
| #include "wtf/RefCounted.h"
|
| @@ -961,8 +960,6 @@ public:
|
| TouchAction touchAction() const { return static_cast<TouchAction>(rareNonInheritedData->m_touchAction); }
|
|
|
| ScrollBehavior scrollBehavior() const { return static_cast<ScrollBehavior>(rareNonInheritedData->m_scrollBehavior); }
|
| - WebScrollBlocksOn scrollBlocksOn() const { return static_cast<WebScrollBlocksOn>(rareNonInheritedData->m_scrollBlocksOn); }
|
| - bool hasScrollBlocksOn() const { return scrollBlocksOn() != WebScrollBlocksOnNone; }
|
|
|
| ScrollSnapType scrollSnapType() const { return static_cast<ScrollSnapType>(rareNonInheritedData->m_scrollSnapType); }
|
| ScrollSnapPoints scrollSnapPointsX() const { return rareNonInheritedData->m_scrollSnap->m_xPoints; }
|
| @@ -1419,7 +1416,6 @@ public:
|
| void setTouchAction(TouchAction t) { SET_VAR(rareNonInheritedData, m_touchAction, t); }
|
|
|
| void setScrollBehavior(ScrollBehavior b) { SET_VAR(rareNonInheritedData, m_scrollBehavior, b); }
|
| - void setScrollBlocksOn(WebScrollBlocksOn b) { SET_VAR(rareNonInheritedData, m_scrollBlocksOn, b); }
|
|
|
| void setScrollSnapType(ScrollSnapType b) { SET_VAR(rareNonInheritedData, m_scrollSnapType, b); }
|
| void setScrollSnapPointsX(const ScrollSnapPoints& b) { SET_VAR(rareNonInheritedData.access()->m_scrollSnap, m_xPoints, b); }
|
| @@ -1707,7 +1703,6 @@ public:
|
| static ShadowList* initialBoxShadow() { return 0; }
|
| static ShadowList* initialTextShadow() { return 0; }
|
| static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorAuto; }
|
| - static WebScrollBlocksOn initialScrollBlocksOn() { return WebScrollBlocksOnNone; }
|
| static ScrollSnapType initialScrollSnapType() { return ScrollSnapTypeNone; }
|
| static ScrollSnapPoints initialScrollSnapPointsX() { return ScrollSnapPoints(); }
|
| static ScrollSnapPoints initialScrollSnapPointsY() { return ScrollSnapPoints(); }
|
|
|