Revert of [css-align] Don't resolve 'auto' values for computed style.

third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

 /*
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2011 Sencha, Inc. All rights reserved.
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 485 matching lines @@
 
   return CSSReflectValue::Create(
       direction, offset, ValueForNinePieceImage(reflection->Mask(), style));
 }
 
 static CSSValueList* ValueForItemPositionWithOverflowAlignment(
     const StyleSelfAlignmentData& data) {
   CSSValueList* result = CSSValueList::CreateSpaceSeparated();
   if (data.PositionType() == kLegacyPosition)
     result->Append(*CSSIdentifierValue::Create(CSSValueLegacy));
-  if (data.GetPosition() == kItemPositionBaseline) {
+  if (data.GetPosition() == kItemPositionAuto) {
+    // To avoid needing to copy the RareNonInheritedData, we repurpose the
+    // 'auto' flag to not just mean 'auto' prior to running the StyleAdjuster
+    // but also mean 'normal' after running it.
+    result->Append(*CSSIdentifierValue::Create(
+        ComputedStyle::InitialDefaultAlignment().GetPosition()));
+  } else if (data.GetPosition() == kItemPositionBaseline) {
     result->Append(
         *CSSValuePair::Create(CSSIdentifierValue::Create(CSSValueBaseline),
                               CSSIdentifierValue::Create(CSSValueBaseline),
                               CSSValuePair::kDropIdenticalValues));
   } else if (data.GetPosition() == kItemPositionLastBaseline) {
     result->Append(
         *CSSValuePair::Create(CSSIdentifierValue::Create(CSSValueLast),
                               CSSIdentifierValue::Create(CSSValueBaseline),
                               CSSValuePair::kDropIdenticalValues));
   } else {
@@ skipping 2083 matching lines @@
     case CSSPropertyImageRendering:
       return CSSIdentifierValue::Create(style.ImageRendering());
     case CSSPropertyImageOrientation:
       if (style.RespectImageOrientation() == kRespectImageOrientation)
         return CSSIdentifierValue::Create(CSSValueFromImage);
       return CSSPrimitiveValue::Create(0,
                                        CSSPrimitiveValue::UnitType::kDegrees);
     case CSSPropertyIsolation:
       return CSSIdentifierValue::Create(style.Isolation());
     case CSSPropertyJustifyItems:
-      return ValueForItemPositionWithOverflowAlignment(
-          style.JustifyItems().GetPosition() == kItemPositionAuto
-              ? ComputedStyle::InitialDefaultAlignment()
-              : style.JustifyItems());
+      return ValueForItemPositionWithOverflowAlignment(style.JustifyItems());
     case CSSPropertyJustifySelf:
       return ValueForItemPositionWithOverflowAlignment(style.JustifySelf());
     case CSSPropertyLeft:
       return ValueForPositionOffset(style, CSSPropertyLeft, layout_object);
     case CSSPropertyLetterSpacing:
       if (!style.LetterSpacing())
         return CSSIdentifierValue::Create(CSSValueNormal);
       return ZoomAdjustedPixelValue(style.LetterSpacing(), style);
     case CSSPropertyWebkitLineClamp:
       if (style.LineClamp().IsNone())
@@ skipping 1125 matching lines @@
     case CSSPropertyAll:
       return nullptr;
     default:
       break;
   }
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace blink