Bug 1277433 - Part 7: Remove eStyleAnimType_EnumU8 related codes. r=birtles draft
authorDaisuke Akatsuka <daisuke@mozilla-japan.org>
Tue, 16 Aug 2016 14:30:16 +0900
changeset 401062 04189d52f4f202ce99ac016328fb1cd11dec3ff5
parent 401061 9aac6422a0f67cb4cfcf15deeb0588af61ddfb36
child 528383 bde8c59c6e0c52616ca8940972b4c92db7acd8ed
push id26349
push userbmo:daisuke@mozilla-japan.org
push dateTue, 16 Aug 2016 06:53:50 +0000
reviewersbirtles
bugs1277433
milestone51.0a1
Bug 1277433 - Part 7: Remove eStyleAnimType_EnumU8 related codes. r=birtles MozReview-Commit-ID: nVN8r0QK4u
layout/style/StyleAnimationValue.cpp
layout/style/nsCSSProps.h
--- a/layout/style/StyleAnimationValue.cpp
+++ b/layout/style/StyleAnimationValue.cpp
@@ -4134,24 +4134,16 @@ StyleAnimationValue::ExtractComputedValu
       aComputedValue.SetAndAdoptCSSValuePairValue(pair.forget(),
                                                   eUnit_CSSValuePair);
       return true;
     }
     case eStyleAnimType_nscoord:
       aComputedValue.SetCoordValue(*static_cast<const nscoord*>(
         StyleDataAtOffset(styleStruct, ssOffset)));
       return true;
-    case eStyleAnimType_EnumU8:
-      aComputedValue.SetIntValue(*static_cast<const uint8_t*>(
-        StyleDataAtOffset(styleStruct, ssOffset)), eUnit_Enumerated);
-      if (aProperty == eCSSProperty_visibility) {
-        aComputedValue.SetIntValue(aComputedValue.GetIntValue(),
-                                   eUnit_Visibility);
-      }
-      return true;
     case eStyleAnimType_float:
       aComputedValue.SetFloatValue(*static_cast<const float*>(
         StyleDataAtOffset(styleStruct, ssOffset)));
       if (aProperty == eCSSProperty_font_size_adjust &&
           aComputedValue.GetFloatValue() == -1.0f) {
         // In nsStyleFont, we set mFont.sizeAdjust to -1.0 to represent
         // font-size-adjust: none.  Here, we have to treat this as a keyword
         // instead of a float value, to make sure we don't end up doing
--- a/layout/style/nsCSSProps.h
+++ b/layout/style/nsCSSProps.h
@@ -303,22 +303,16 @@ enum nsStyleAnimType {
   eStyleAnimType_Corner_TopLeft,
   eStyleAnimType_Corner_TopRight,
   eStyleAnimType_Corner_BottomRight,
   eStyleAnimType_Corner_BottomLeft,
 
   // nscoord values
   eStyleAnimType_nscoord,
 
-  // enumerated values (stored in a uint8_t)
-  // In order for a property to use this unit, _all_ of its enumerated values
-  // must be listed in its keyword table, so that any enumerated value can be
-  // converted into a string via a nsCSSValue of type eCSSUnit_Enumerated.
-  eStyleAnimType_EnumU8,
-
   // float values
   eStyleAnimType_float,
 
   // nscolor values
   eStyleAnimType_Color,
 
   // nsStyleSVGPaint values
   eStyleAnimType_PaintServer,