Change CSSContentDistributionValue functions return CSSValueIDs.

As the comment in CSSContentDistributionValue.h by sashab@,
makes Distribution/GetPosition/Overflow functions return CSSValueIDs
instead of CSSIdentifierValues.
Also rename GetPosition to Position.

BUG=
Signed-off-by: Zhuoyu Qian <zhuoyu.qian@samsung.com>
Change-Id: I3d16dceddbc3132d095453d389113f2925b52f52
Reviewed-on: https://chromium-review.googlesource.com/828565Reviewed-by: Darren Shen <shend@chromium.org>
Reviewed-by: Sasha Morrissey <sashab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#525254}

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

@@ -24,7 +24,7 @@ String CSSContentDistributionValue::CustomCSSText() const {
   CSSValueList* list = CSSValueList::CreateSpaceSeparated();
 
   if (distribution_ != CSSValueInvalid)
-    list->Append(*Distribution());
+    list->Append(*CSSIdentifierValue::Create(distribution_));
   if (position_ != CSSValueInvalid) {
     if (position_ == CSSValueFirstBaseline ||
         position_ == CSSValueLastBaseline) {
@@ -33,11 +33,11 @@ String CSSContentDistributionValue::CustomCSSText() const {
       list->Append(*CSSIdentifierValue::Create(preference));
       list->Append(*CSSIdentifierValue::Create(CSSValueBaseline));
     } else {
-      list->Append(*GetPosition());
+      list->Append(*CSSIdentifierValue::Create(position_));
     }
   }
   if (overflow_ != CSSValueInvalid)
-    list->Append(*Overflow());
+    list->Append(*CSSIdentifierValue::Create(overflow_));
 
   return list->CustomCSSText();
 }

third_party/WebKit/Source/core/css/CSSContentDistributionValue.h

@@ -21,18 +21,11 @@ class CSSContentDistributionValue : public CSSValue {
   }
   ~CSSContentDistributionValue();
 
-  // TODO(sashab): Make these return CSSValueIDs instead of CSSValues.
-  CSSIdentifierValue* Distribution() const {
-    return CSSIdentifierValue::Create(distribution_);
-  }
+  CSSValueID Distribution() const { return distribution_; }
 
-  CSSIdentifierValue* GetPosition() const {
-    return CSSIdentifierValue::Create(position_);
-  }
+  CSSValueID Position() const { return position_; }
 
-  CSSIdentifierValue* Overflow() const {
-    return CSSIdentifierValue::Create(overflow_);
-  }
+  CSSValueID Overflow() const { return overflow_; }
 
   String CustomCSSText() const;
 

third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

@@ -714,15 +714,21 @@ StyleContentAlignmentData StyleBuilderConverter::ConvertContentAlignmentData(
       ComputedStyleInitialValues::InitialContentAlignment();
   const CSSContentDistributionValue& content_value =
       ToCSSContentDistributionValue(value);
-  if (content_value.Distribution()->GetValueID() != CSSValueInvalid)
+  if (content_value.Distribution() != CSSValueInvalid) {
     alignment_data.SetDistribution(
-        content_value.Distribution()->ConvertTo<ContentDistributionType>());
-  if (content_value.GetPosition()->GetValueID() != CSSValueInvalid)
+        CSSIdentifierValue::Create(content_value.Distribution())
+            ->ConvertTo<ContentDistributionType>());
+  }
+  if (content_value.Position() != CSSValueInvalid) {
     alignment_data.SetPosition(
-        content_value.GetPosition()->ConvertTo<ContentPosition>());
-  if (content_value.Overflow()->GetValueID() != CSSValueInvalid)
+        CSSIdentifierValue::Create(content_value.Position())
+            ->ConvertTo<ContentPosition>());
+  }
+  if (content_value.Overflow() != CSSValueInvalid) {
     alignment_data.SetOverflow(
-        content_value.Overflow()->ConvertTo<OverflowAlignment>());
+        CSSIdentifierValue::Create(content_value.Overflow())
+            ->ConvertTo<OverflowAlignment>());
+  }
 
   return alignment_data;
 }