OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) | 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All | 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
6 * rights reserved. | 6 * rights reserved. |
7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
8 * | 8 * |
9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
(...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
671 return rare_non_inherited_data_->multi_col_->rule_.Style(); | 671 return rare_non_inherited_data_->multi_col_->rule_.Style(); |
672 } | 672 } |
673 void SetColumnRuleStyle(EBorderStyle b) { | 673 void SetColumnRuleStyle(EBorderStyle b) { |
674 SET_NESTED_VAR(rare_non_inherited_data_, multi_col_, rule_.style_, | 674 SET_NESTED_VAR(rare_non_inherited_data_, multi_col_, rule_.style_, |
675 static_cast<unsigned>(b)); | 675 static_cast<unsigned>(b)); |
676 } | 676 } |
677 | 677 |
678 // column-rule-width (aka -webkit-column-rule-width) | 678 // column-rule-width (aka -webkit-column-rule-width) |
679 static unsigned short InitialColumnRuleWidth() { return 3; } | 679 static unsigned short InitialColumnRuleWidth() { return 3; } |
680 unsigned short ColumnRuleWidth() const { | 680 unsigned short ColumnRuleWidth() const { |
681 return rare_non_inherited_data_->multi_col_->RuleWidth(); | 681 const BorderValue& rule = rare_non_inherited_data_->multi_col_->rule_; |
| 682 if (rule.Style() == EBorderStyle::kNone || |
| 683 rule.Style() == EBorderStyle::kHidden) |
| 684 return 0; |
| 685 return rule.Width(); |
682 } | 686 } |
683 void SetColumnRuleWidth(unsigned short w) { | 687 void SetColumnRuleWidth(unsigned short w) { |
684 SET_NESTED_BORDER_WIDTH(rare_non_inherited_data_, multi_col_, rule_, w); | 688 SET_NESTED_BORDER_WIDTH(rare_non_inherited_data_, multi_col_, rule_, w); |
685 } | 689 } |
686 | 690 |
687 // column-span (aka -webkit-column-span) | 691 // column-span (aka -webkit-column-span) |
688 static ColumnSpan InitialColumnSpan() { return kColumnSpanNone; } | 692 static ColumnSpan InitialColumnSpan() { return kColumnSpanNone; } |
689 ColumnSpan GetColumnSpan() const { | 693 ColumnSpan GetColumnSpan() const { |
690 return static_cast<ColumnSpan>( | 694 return static_cast<ColumnSpan>( |
691 rare_non_inherited_data_->multi_col_->column_span_); | 695 rare_non_inherited_data_->multi_col_->column_span_); |
(...skipping 2944 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3636 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); | 3640 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); |
3637 } | 3641 } |
3638 | 3642 |
3639 inline bool ComputedStyle::HasPseudoElementStyle() const { | 3643 inline bool ComputedStyle::HasPseudoElementStyle() const { |
3640 return PseudoBitsInternal() & kElementPseudoIdMask; | 3644 return PseudoBitsInternal() & kElementPseudoIdMask; |
3641 } | 3645 } |
3642 | 3646 |
3643 } // namespace blink | 3647 } // namespace blink |
3644 | 3648 |
3645 #endif // ComputedStyle_h | 3649 #endif // ComputedStyle_h |
OLD | NEW |