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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2825663002: Split initial methods of margin on ComputedStyle. (Closed)
Patch Set: Rebase Created 3 years, 8 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 unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSProperties.json5 ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1073 matching lines...) Expand 10 before | Expand all | Expand 10 after
1084 // isolation 1084 // isolation
1085 static EIsolation InitialIsolation() { return kIsolationAuto; } 1085 static EIsolation InitialIsolation() { return kIsolationAuto; }
1086 EIsolation Isolation() const { 1086 EIsolation Isolation() const {
1087 return static_cast<EIsolation>(rare_non_inherited_data_->isolation_); 1087 return static_cast<EIsolation>(rare_non_inherited_data_->isolation_);
1088 } 1088 }
1089 void SetIsolation(EIsolation v) { 1089 void SetIsolation(EIsolation v) {
1090 rare_non_inherited_data_.Access()->isolation_ = v; 1090 rare_non_inherited_data_.Access()->isolation_ = v;
1091 } 1091 }
1092 1092
1093 // Margin properties. 1093 // Margin properties.
1094 static Length InitialMargin() { return Length(kFixed); }
1095 1094
1096 // margin-top 1095 // margin-top
1096 static Length InitialMarginTop() { return Length(kFixed); }
1097 const Length& MarginTop() const { return surround_->margin_.Top(); } 1097 const Length& MarginTop() const { return surround_->margin_.Top(); }
1098 void SetMarginTop(const Length& v) { SET_VAR(surround_, margin_.top_, v); } 1098 void SetMarginTop(const Length& v) { SET_VAR(surround_, margin_.top_, v); }
1099 1099
1100 // margin-bottom 1100 // margin-bottom
1101 static Length InitialMarginBottom() { return Length(kFixed); }
1101 const Length& MarginBottom() const { return surround_->margin_.Bottom(); } 1102 const Length& MarginBottom() const { return surround_->margin_.Bottom(); }
1102 void SetMarginBottom(const Length& v) { 1103 void SetMarginBottom(const Length& v) {
1103 SET_VAR(surround_, margin_.bottom_, v); 1104 SET_VAR(surround_, margin_.bottom_, v);
1104 } 1105 }
1105 1106
1106 // margin-left 1107 // margin-left
1108 static Length InitialMarginLeft() { return Length(kFixed); }
1107 const Length& MarginLeft() const { return surround_->margin_.Left(); } 1109 const Length& MarginLeft() const { return surround_->margin_.Left(); }
1108 void SetMarginLeft(const Length& v) { SET_VAR(surround_, margin_.left_, v); } 1110 void SetMarginLeft(const Length& v) { SET_VAR(surround_, margin_.left_, v); }
1109 1111
1110 // margin-right 1112 // margin-right
1113 static Length InitialMarginRight() { return Length(kFixed); }
1111 const Length& MarginRight() const { return surround_->margin_.Right(); } 1114 const Length& MarginRight() const { return surround_->margin_.Right(); }
1112 void SetMarginRight(const Length& v) { 1115 void SetMarginRight(const Length& v) {
1113 SET_VAR(surround_, margin_.right_, v); 1116 SET_VAR(surround_, margin_.right_, v);
1114 } 1117 }
1115 1118
1116 // -webkit-margin-before-collapse (aka -webkit-margin-top-collapse) 1119 // -webkit-margin-before-collapse (aka -webkit-margin-top-collapse)
1117 static EMarginCollapse InitialMarginBeforeCollapse() { 1120 static EMarginCollapse InitialMarginBeforeCollapse() {
1118 return kMarginCollapseCollapse; 1121 return kMarginCollapseCollapse;
1119 } 1122 }
1120 EMarginCollapse MarginAfterCollapse() const { 1123 EMarginCollapse MarginAfterCollapse() const {
(...skipping 2592 matching lines...) Expand 10 before | Expand all | Expand 10 after
3713 pseudo_bits_ |= 1 << (pseudo - kFirstPublicPseudoId); 3716 pseudo_bits_ |= 1 << (pseudo - kFirstPublicPseudoId);
3714 } 3717 }
3715 3718
3716 inline bool ComputedStyle::HasPseudoElementStyle() const { 3719 inline bool ComputedStyle::HasPseudoElementStyle() const {
3717 return pseudo_bits_ & kElementPseudoIdMask; 3720 return pseudo_bits_ & kElementPseudoIdMask;
3718 } 3721 }
3719 3722
3720 } // namespace blink 3723 } // namespace blink
3721 3724
3722 #endif // ComputedStyle_h 3725 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSProperties.json5 ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698