Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1130)

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2916843002: Move StyleMultiColData::RuleWidth to ComputedStyle. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/style/StyleMultiColData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/style/StyleMultiColData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698