| 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 776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 787 return static_cast<EFlexWrap>( | 787 return static_cast<EFlexWrap>( |
| 788 rare_non_inherited_data_->flexible_box_data_->flex_wrap_); | 788 rare_non_inherited_data_->flexible_box_data_->flex_wrap_); |
| 789 } | 789 } |
| 790 void SetFlexWrap(EFlexWrap w) { | 790 void SetFlexWrap(EFlexWrap w) { |
| 791 SET_NESTED_VAR(rare_non_inherited_data_, flexible_box_data_, flex_wrap_, w); | 791 SET_NESTED_VAR(rare_non_inherited_data_, flexible_box_data_, flex_wrap_, w); |
| 792 } | 792 } |
| 793 | 793 |
| 794 // -webkit-box-flex | 794 // -webkit-box-flex |
| 795 static float InitialBoxFlex() { return 0.0f; } | 795 static float InitialBoxFlex() { return 0.0f; } |
| 796 float BoxFlex() const { | 796 float BoxFlex() const { |
| 797 return rare_non_inherited_data_->deprecated_flexible_box_data_data_->flex; | 797 return rare_non_inherited_data_->deprecated_flexible_box_data_->flex; |
| 798 } | 798 } |
| 799 void SetBoxFlex(float f) { | 799 void SetBoxFlex(float f) { |
| 800 SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_data_data_, | 800 SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_data_, |
| 801 flex, f); | 801 flex, f); |
| 802 } | 802 } |
| 803 | 803 |
| 804 // -webkit-box-flex-group | 804 // -webkit-box-flex-group |
| 805 static unsigned InitialBoxFlexGroup() { return 1; } | 805 static unsigned InitialBoxFlexGroup() { return 1; } |
| 806 unsigned BoxFlexGroup() const { | 806 unsigned BoxFlexGroup() const { |
| 807 return rare_non_inherited_data_->deprecated_flexible_box_data_data_ | 807 return rare_non_inherited_data_->deprecated_flexible_box_data_->flex_group; |
| 808 ->flex_group; | |
| 809 } | 808 } |
| 810 void SetBoxFlexGroup(unsigned fg) { | 809 void SetBoxFlexGroup(unsigned fg) { |
| 811 SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_data_data_, | 810 SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_data_, |
| 812 flex_group, fg); | 811 flex_group, fg); |
| 813 } | 812 } |
| 814 | 813 |
| 815 // -webkit-box-align | 814 // -webkit-box-align |
| 816 // For valid values of box-align see | 815 // For valid values of box-align see |
| 817 // http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/#alignment | 816 // http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/#alignment |
| 818 static EBoxAlignment InitialBoxAlign() { return BSTRETCH; } | 817 static EBoxAlignment InitialBoxAlign() { return BSTRETCH; } |
| 819 EBoxAlignment BoxAlign() const { | 818 EBoxAlignment BoxAlign() const { |
| 820 return static_cast<EBoxAlignment>( | 819 return static_cast<EBoxAlignment>( |
| 821 rare_non_inherited_data_->deprecated_flexible_box_data_data_->align); | 820 rare_non_inherited_data_->deprecated_flexible_box_data_->align); |
| 822 } | 821 } |
| 823 void SetBoxAlign(EBoxAlignment a) { | 822 void SetBoxAlign(EBoxAlignment a) { |
| 824 SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_data_data_, | 823 SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_data_, |
| 825 align, a); | 824 align, a); |
| 826 } | 825 } |
| 827 | 826 |
| 828 // -webkit-box-lines | 827 // -webkit-box-lines |
| 829 static EBoxLines InitialBoxLines() { return SINGLE; } | 828 static EBoxLines InitialBoxLines() { return SINGLE; } |
| 830 EBoxLines BoxLines() const { | 829 EBoxLines BoxLines() const { |
| 831 return static_cast<EBoxLines>( | 830 return static_cast<EBoxLines>( |
| 832 rare_non_inherited_data_->deprecated_flexible_box_data_data_->lines); | 831 rare_non_inherited_data_->deprecated_flexible_box_data_->lines); |
| 833 } | 832 } |
| 834 void SetBoxLines(EBoxLines lines) { | 833 void SetBoxLines(EBoxLines lines) { |
| 835 SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_data_data_, | 834 SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_data_, |
| 836 lines, lines); | 835 lines, lines); |
| 837 } | 836 } |
| 838 | 837 |
| 839 // -webkit-box-ordinal-group | 838 // -webkit-box-ordinal-group |
| 840 static unsigned InitialBoxOrdinalGroup() { return 1; } | 839 static unsigned InitialBoxOrdinalGroup() { return 1; } |
| 841 unsigned BoxOrdinalGroup() const { | 840 unsigned BoxOrdinalGroup() const { |
| 842 return rare_non_inherited_data_->deprecated_flexible_box_data_data_ | 841 return rare_non_inherited_data_->deprecated_flexible_box_data_ |
| 843 ->ordinal_group; | 842 ->ordinal_group; |
| 844 } | 843 } |
| 845 void SetBoxOrdinalGroup(unsigned og) { | 844 void SetBoxOrdinalGroup(unsigned og) { |
| 846 SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_data_data_, | 845 SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_data_, |
| 847 ordinal_group, | 846 ordinal_group, |
| 848 std::min(std::numeric_limits<unsigned>::max() - 1, og)); | 847 std::min(std::numeric_limits<unsigned>::max() - 1, og)); |
| 849 } | 848 } |
| 850 | 849 |
| 851 // -webkit-box-orient | 850 // -webkit-box-orient |
| 852 static EBoxOrient InitialBoxOrient() { return HORIZONTAL; } | 851 static EBoxOrient InitialBoxOrient() { return HORIZONTAL; } |
| 853 EBoxOrient BoxOrient() const { | 852 EBoxOrient BoxOrient() const { |
| 854 return static_cast<EBoxOrient>( | 853 return static_cast<EBoxOrient>( |
| 855 rare_non_inherited_data_->deprecated_flexible_box_data_data_->orient); | 854 rare_non_inherited_data_->deprecated_flexible_box_data_->orient); |
| 856 } | 855 } |
| 857 void SetBoxOrient(EBoxOrient o) { | 856 void SetBoxOrient(EBoxOrient o) { |
| 858 SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_data_data_, | 857 SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_data_, |
| 859 orient, o); | 858 orient, o); |
| 860 } | 859 } |
| 861 | 860 |
| 862 // -webkit-box-pack | 861 // -webkit-box-pack |
| 863 static EBoxPack InitialBoxPack() { return kBoxPackStart; } | 862 static EBoxPack InitialBoxPack() { return kBoxPackStart; } |
| 864 EBoxPack BoxPack() const { | 863 EBoxPack BoxPack() const { |
| 865 return static_cast<EBoxPack>( | 864 return static_cast<EBoxPack>( |
| 866 rare_non_inherited_data_->deprecated_flexible_box_data_data_->pack); | 865 rare_non_inherited_data_->deprecated_flexible_box_data_->pack); |
| 867 } | 866 } |
| 868 void SetBoxPack(EBoxPack p) { | 867 void SetBoxPack(EBoxPack p) { |
| 869 SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_data_data_, | 868 SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_data_, |
| 870 pack, p); | 869 pack, p); |
| 871 } | 870 } |
| 872 | 871 |
| 873 // -webkit-box-reflect | 872 // -webkit-box-reflect |
| 874 static StyleReflection* InitialBoxReflect() { return 0; } | 873 static StyleReflection* InitialBoxReflect() { return 0; } |
| 875 StyleReflection* BoxReflect() const { | 874 StyleReflection* BoxReflect() const { |
| 876 return rare_non_inherited_data_->box_reflect_.Get(); | 875 return rare_non_inherited_data_->box_reflect_.Get(); |
| 877 } | 876 } |
| 878 void SetBoxReflect(RefPtr<StyleReflection> reflect) { | 877 void SetBoxReflect(RefPtr<StyleReflection> reflect) { |
| 879 if (rare_non_inherited_data_->box_reflect_ != reflect) | 878 if (rare_non_inherited_data_->box_reflect_ != reflect) |
| (...skipping 2711 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3591 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); | 3590 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); |
| 3592 } | 3591 } |
| 3593 | 3592 |
| 3594 inline bool ComputedStyle::HasPseudoElementStyle() const { | 3593 inline bool ComputedStyle::HasPseudoElementStyle() const { |
| 3595 return PseudoBitsInternal() & kElementPseudoIdMask; | 3594 return PseudoBitsInternal() & kElementPseudoIdMask; |
| 3596 } | 3595 } |
| 3597 | 3596 |
| 3598 } // namespace blink | 3597 } // namespace blink |
| 3599 | 3598 |
| 3600 #endif // ComputedStyle_h | 3599 #endif // ComputedStyle_h |
| OLD | NEW |