[layoutng] Fix extra margin space computation

The Optional<> rewrite reversed the sign on extra margin space.

Also updated test expectations. Down to 165 failed from 207

BUG=635619

Review-Url: https://codereview.chromium.org/2623103002
Cr-Commit-Position: refs/heads/master@{#443419}

third_party/WebKit/LayoutTests/TestExpectations

@@ -154,16 +154,11 @@ crbug.com/674468 [ Trusty ] compositing/reflections/nested-reflection-transition
 # LayoutNG - is a new layout system for Blink.
 
 #### css2.1/20110323
-#### Passed: 202
-#### Skipped: 207
+#### Passed: 244
+#### Skipped: 165
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-height-001.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-height-004.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-height-005.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-height-006.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-height-009.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-height-010.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-height-011.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-height-012.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-max-height-001.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-max-height-003.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-max-height-004.htm [ Skip ]
@@ -174,10 +169,6 @@ crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-max-hei
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-max-height-010.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-max-height-011.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-max-height-012.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-width-006.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-width-007.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-width-008.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-width-009.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-width-017.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-width-018.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-width-019.htm [ Skip ]
@@ -241,21 +232,9 @@ crbug.com/635619 virtual/layout_ng/css2.1/20110323/abspos-containing-block-initi
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/abspos-containing-block-initial-009a.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/abspos-non-replaced-width-margin-000.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/abspos-replaced-width-margin-000.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/background-intrinsic-001.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/background-intrinsic-002.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/background-intrinsic-003.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/background-intrinsic-004.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/background-intrinsic-005.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/background-intrinsic-006.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/background-intrinsic-007.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/background-intrinsic-008.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/background-intrinsic-009.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-height-002.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-height-003.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-height-004.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-height-005.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-height-006.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-height-007.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-height-008.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-height-009.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-height-010.htm [ Skip ]
@@ -263,28 +242,16 @@ crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-height-011
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-height-012.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-height-013.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-height-014.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-height-015.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-height-016.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-width-001.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-width-002.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-width-003.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-non-replaced-width-004.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-replaced-height-002.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-replaced-height-003.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-replaced-height-004.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-replaced-height-005.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/block-replaced-height-007.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/c543-txt-decor-000.html [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/clip-001.html [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/dynamic-top-change-001.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/dynamic-top-change-002.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/dynamic-top-change-003.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/dynamic-top-change-004.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/dynamic-top-change-005.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/dynamic-top-change-005a.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/dynamic-top-change-005b.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/empty-inline-001.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/empty-inline-003.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/float-non-replaced-height-001.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/float-non-replaced-width-004.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/float-non-replaced-width-006.htm [ Skip ]
@@ -317,21 +284,13 @@ crbug.com/635619 virtual/layout_ng/css2.1/20110323/height-applies-to-010a.htm [
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/height-percentage-005.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/height-width-inline-table-001.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/height-width-table-001.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/inline-block-non-replaced-height-001.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/inline-block-non-replaced-height-002.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/inline-block-replaced-height-002.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/inline-block-replaced-height-003.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/inline-block-replaced-height-004.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/inline-block-replaced-height-005.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/inline-block-replaced-height-007.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/inline-non-replaced-height-002.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/inline-non-replaced-height-003.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/inline-replaced-height-002.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/inline-replaced-height-003.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/inline-replaced-height-004.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/inline-replaced-height-005.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/inline-replaced-height-007.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/inline-replaced-width-015.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/inline-table-001.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/margin-applies-to-001.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/margin-applies-to-002.htm [ Skip ]
@@ -362,7 +321,6 @@ crbug.com/635619 virtual/layout_ng/css2.1/20110323/replaced-intrinsic-004.htm [
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/replaced-intrinsic-005.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/replaced-intrinsic-ratio-001.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/table-caption-margins-001.htm [ Skip ]
-crbug.com/635619 virtual/layout_ng/css2.1/20110323/width-replaced-element-001.htm [ Skip ]
 
 #### fast/block/basic
 #### Passed: 12

third_party/WebKit/Source/core/layout/ng/ng_absolute_utils.cc

@@ -117,12 +117,13 @@ void ComputeAbsoluteHorizontal(
       margin_right = margin_space - *margin_left;
     } else {
       // Are values overconstrained?
-      if (*margin_left + *margin_right != margin_space) {
+      LayoutUnit margin_extra = margin_space - *margin_left - *margin_right;
+      if (margin_extra) {
         // Relax the end.
         if (space.Direction() == TextDirection::kLtr)
-          right = *right - *margin_left + *margin_right - margin_space;
+          right = *right + margin_extra;
         else
-          left = *left - *margin_left + *margin_right - margin_space;
+          left = *left + margin_extra;
       }
     }
   }
@@ -260,11 +261,9 @@ void ComputeAbsoluteVertical(
     } else if (!margin_bottom) {
       margin_bottom = margin_space - *margin_top;
     } else {
-      // Are values overconstrained?
-      if (*margin_top + *margin_bottom != margin_space) {
-        // Relax the end.
-        bottom = *bottom - *margin_top + *margin_bottom - margin_space;
-      }
+      LayoutUnit margin_extra = margin_space - *margin_top - *margin_bottom;
+      if (margin_extra)
+        bottom = *bottom + margin_extra;
     }
   }