Bug 1292447: part 4 - Get vertical-align prop resolved to computed value. draft
authorAstley Chen <aschen@mozilla.com>
Mon, 03 Oct 2016 18:14:20 +0800
changeset 420155 fbd41abcb224ddef266d18f60fc958aa78fc4ad9
parent 420154 4988e9a956a33bb7167803d1ff06f26c839edb29
child 420156 60aa1c28647a172b850f0abc30ff6553ed8afd2e
push id31116
push useraschen@mozilla.com
push dateMon, 03 Oct 2016 15:25:03 +0000
bugs1292447
milestone52.0a1
Bug 1292447: part 4 - Get vertical-align prop resolved to computed value. MozReview-Commit-ID: 542KRnVAojo
layout/style/nsCSSPropList.h
layout/style/nsComputedDOMStyle.cpp
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -4348,18 +4348,17 @@ CSS_PROP_SVGRESET(
 CSS_PROP_DISPLAY(
     vertical-align,
     vertical_align,
     VerticalAlign,
     CSS_PROPERTY_PARSE_VALUE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE |
         CSS_PROPERTY_APPLIES_TO_PLACEHOLDER |
         CSS_PROPERTY_STORES_CALC |
-        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK |
-        CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH,
+        CSS_PROPERTY_UNITLESS_LENGTH_QUIRK,
     "",
     VARIANT_HKLP | VARIANT_CALC,
     kVerticalAlignKTable,
     offsetof(nsStyleDisplay, mVerticalAlign),
     eStyleAnimType_Coord)
 CSS_PROP_VISIBILITY(
     visibility,
     visibility,
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -3643,18 +3643,17 @@ nsComputedDOMStyle::DoGetRubyPosition()
   return val.forget();
 }
 
 already_AddRefed<CSSValue>
 nsComputedDOMStyle::DoGetVerticalAlign()
 {
   RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
   SetValueToCoord(val, StyleDisplay()->mVerticalAlign, false,
-                  &nsComputedDOMStyle::GetLineHeightCoord,
-                  nsCSSProps::kVerticalAlignKTable);
+                  nullptr, nsCSSProps::kVerticalAlignKTable);
   return val.forget();
 }
 
 already_AddRefed<CSSValue>
 nsComputedDOMStyle::CreateTextAlignValue(uint8_t aAlign, bool aAlignTrue,
                                          const KTableEntry aTable[])
 {
   RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;