| Index: Source/core/rendering/style/RenderStyle.h
|
| diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
|
| index 6cf4d885123a01797b554a173485f86f8111ed5d..aeab6cfe76794dfcf077d8f733daefe81e338798 100644
|
| --- a/Source/core/rendering/style/RenderStyle.h
|
| +++ b/Source/core/rendering/style/RenderStyle.h
|
| @@ -905,7 +905,9 @@ public:
|
|
|
| LineBoxContain lineBoxContain() const { return rareInheritedData->m_lineBoxContain; }
|
| const LineClampValue& lineClamp() const { return rareNonInheritedData->lineClamp; }
|
| +#if ENABLE(TOUCH_EVENTS)
|
| Color tapHighlightColor() const { return rareInheritedData->tapHighlightColor; }
|
| +#endif
|
| #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
|
| bool useTouchOverflowScrolling() const { return rareInheritedData->useTouchOverflowScrolling; }
|
| #endif
|
| @@ -1348,7 +1350,9 @@ public:
|
|
|
| void setLineBoxContain(LineBoxContain c) { SET_VAR(rareInheritedData, m_lineBoxContain, c); }
|
| void setLineClamp(LineClampValue c) { SET_VAR(rareNonInheritedData, lineClamp, c); }
|
| +#if ENABLE(TOUCH_EVENTS)
|
| void setTapHighlightColor(const Color& c) { SET_VAR(rareInheritedData, tapHighlightColor, c); }
|
| +#endif
|
| #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
|
| void setUseTouchOverflowScrolling(bool v) { SET_VAR(rareInheritedData, useTouchOverflowScrolling, v); }
|
| #endif
|
| @@ -1668,7 +1672,9 @@ public:
|
| // Keep these at the end.
|
| static LineClampValue initialLineClamp() { return LineClampValue(); }
|
| static ETextSecurity initialTextSecurity() { return TSNONE; }
|
| +#if ENABLE(TOUCH_EVENTS)
|
| static Color initialTapHighlightColor();
|
| +#endif
|
| #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
|
| static bool initialUseTouchOverflowScrolling() { return false; }
|
| #endif
|
|
|