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 20c3762a4e21a297324d5a7dded9ca910a457b69..7ba4f6d89c181ad1b4e3d9b17c44e21d770dcd58 100644 |
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h |
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h |
@@ -728,36 +728,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase, |
} |
void SetContent(ContentData*); |
- // Flex properties. |
- // flex-basis (aka -webkit-flex-basis) |
- static Length InitialFlexBasis() { return Length(kAuto); } |
- const Length& FlexBasis() const { |
- return rare_non_inherited_data_->flexible_box_data_->flex_basis_; |
- } |
- void SetFlexBasis(const Length& length) { |
- SET_NESTED_VAR(rare_non_inherited_data_, flexible_box_data_, flex_basis_, |
- length); |
- } |
- |
- // flex-grow (aka -webkit-flex-grow) |
- static float InitialFlexGrow() { return 0; } |
- float FlexGrow() const { |
- return rare_non_inherited_data_->flexible_box_data_->flex_grow_; |
- } |
- void SetFlexGrow(float f) { |
- SET_NESTED_VAR(rare_non_inherited_data_, flexible_box_data_, flex_grow_, f); |
- } |
- |
- // flex-shrink (aka -webkit-flex-shrink) |
- static float InitialFlexShrink() { return 1; } |
- float FlexShrink() const { |
- return rare_non_inherited_data_->flexible_box_data_->flex_shrink_; |
- } |
- void SetFlexShrink(float f) { |
- SET_NESTED_VAR(rare_non_inherited_data_, flexible_box_data_, flex_shrink_, |
- f); |
- } |
- |
// -webkit-box-ordinal-group |
static unsigned InitialBoxOrdinalGroup() { return 1; } |
unsigned BoxOrdinalGroup() const { |