| Index: third_party/WebKit/Source/core/style/ComputedStyle.h
|
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| index 2e37d8a8bfe9e97322476b0e433e6d3f1409b841..86133fa1034b602f9a4243d7a8b15ccb83c84eb3 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -678,7 +678,11 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
|
| // column-rule-width (aka -webkit-column-rule-width)
|
| static unsigned short InitialColumnRuleWidth() { return 3; }
|
| unsigned short ColumnRuleWidth() const {
|
| - return rare_non_inherited_data_->multi_col_->RuleWidth();
|
| + const BorderValue& rule = rare_non_inherited_data_->multi_col_->rule_;
|
| + if (rule.Style() == EBorderStyle::kNone ||
|
| + rule.Style() == EBorderStyle::kHidden)
|
| + return 0;
|
| + return rule.Width();
|
| }
|
| void SetColumnRuleWidth(unsigned short w) {
|
| SET_NESTED_BORDER_WIDTH(rare_non_inherited_data_, multi_col_, rule_, w);
|
|
|