| Index: Source/core/rendering/style/RenderStyle.h
|
| diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
|
| index 962b8de93d7cff2eae81d92ab4a6396d42af81a5..e5d58c4c6a7f17de905b249b21193bb3bb1c5202 100644
|
| --- a/Source/core/rendering/style/RenderStyle.h
|
| +++ b/Source/core/rendering/style/RenderStyle.h
|
| @@ -1011,13 +1011,23 @@ public:
|
| DraggableRegionMode getDraggableRegionMode() const { return rareNonInheritedData->m_draggableRegionMode; }
|
| void setDraggableRegionMode(DraggableRegionMode v) { SET_VAR(rareNonInheritedData, m_draggableRegionMode, v); }
|
|
|
| - void resetBorder() { resetBorderImage(); resetBorderTop(); resetBorderRight(); resetBorderBottom(); resetBorderLeft(); resetBorderRadius(); }
|
| + void resetBorder()
|
| + {
|
| + resetBorderImage();
|
| + resetBorderTop();
|
| + resetBorderRight();
|
| + resetBorderBottom();
|
| + resetBorderLeft();
|
| + resetBorderTopLeftRadius();
|
| + resetBorderTopRightRadius();
|
| + resetBorderBottomLeftRadius();
|
| + resetBorderBottomRightRadius();
|
| + }
|
| void resetBorderTop() { SET_VAR(surround, border.m_top, BorderValue()); }
|
| void resetBorderRight() { SET_VAR(surround, border.m_right, BorderValue()); }
|
| void resetBorderBottom() { SET_VAR(surround, border.m_bottom, BorderValue()); }
|
| void resetBorderLeft() { SET_VAR(surround, border.m_left, BorderValue()); }
|
| void resetBorderImage() { SET_VAR(surround, border.m_image, NinePieceImage()); }
|
| - void resetBorderRadius() { resetBorderTopLeftRadius(); resetBorderTopRightRadius(); resetBorderBottomLeftRadius(); resetBorderBottomRightRadius(); }
|
| void resetBorderTopLeftRadius() { SET_VAR(surround, border.m_topLeft, initialBorderRadius()); }
|
| void resetBorderTopRightRadius() { SET_VAR(surround, border.m_topRight, initialBorderRadius()); }
|
| void resetBorderBottomLeftRadius() { SET_VAR(surround, border.m_bottomLeft, initialBorderRadius()); }
|
| @@ -1188,7 +1198,6 @@ public:
|
| void setListStyleImage(PassRefPtr<StyleImage>);
|
| void setListStylePosition(EListStylePosition v) { inherited_flags._list_style_position = v; }
|
|
|
| - void resetMargin() { SET_VAR(surround, margin, LengthBox(Fixed)); }
|
| void setMarginTop(const Length& v) { SET_VAR(surround, margin.m_top, v); }
|
| void setMarginBottom(const Length& v) { SET_VAR(surround, margin.m_bottom, v); }
|
| void setMarginLeft(const Length& v) { SET_VAR(surround, margin.m_left, v); }
|
|
|