Bug 1311270 - Part 5. Remove duplicate static_assert. draft
authorcku <cku@mozilla.com>
Tue, 22 Nov 2016 19:18:54 +0800
changeset 443043 2aa56747039fac200e5bc5a00ae0dd00e6fc235c
parent 443042 4decfc9b9133782788982afdf6dce3f29461fd40
child 443044 3492b1a3023222b3269bad21de787043e35c162b
push id36890
push userbmo:cku@mozilla.com
push dateWed, 23 Nov 2016 19:16:58 +0000
bugs1311270
milestone53.0a1
Bug 1311270 - Part 5. Remove duplicate static_assert. We already have this static_assertion in nsCSSProps.cpp(right bellow kImageLayerAttachmentKTable definition). No need to keep them in three place. MozReview-Commit-ID: 7V8IuZzhJiF
layout/style/Declaration.cpp
layout/style/nsCSSParser.cpp
--- a/layout/style/Declaration.cpp
+++ b/layout/style/Declaration.cpp
@@ -407,31 +407,16 @@ Declaration::GetImageLayerValue(
       const nsCSSProps::KTableEntry* clipTable = nsCSSProps::kKeywordTableTable[aTable[nsStyleImageLayers::clip]];
       for (size_t i = 0; originTable[i].mValue != -1; i++) {
         // For each keyword & value in kOriginKTable, ensure that
         // kBackgroundKTable has a matching entry at the same position.
         MOZ_ASSERT(originTable[i].mKeyword == clipTable[i].mKeyword);
         MOZ_ASSERT(originTable[i].mValue == clipTable[i].mValue);
       }
 #endif
-      static_assert(static_cast<uint8_t>(StyleGeometryBox::Content) ==
-                    static_cast<uint8_t>(StyleImageLayerOrigin::Content) &&
-                    static_cast<uint8_t>(StyleGeometryBox::Padding) ==
-                    static_cast<uint8_t>(StyleImageLayerOrigin::Padding) &&
-                    static_cast<uint8_t>(StyleGeometryBox::Border) ==
-                    static_cast<uint8_t>(StyleImageLayerOrigin::Border) &&
-                    static_cast<uint8_t>(StyleGeometryBox::Margin) ==
-                    static_cast<uint8_t>(StyleImageLayerOrigin::Margin) &&
-                    static_cast<uint8_t>(StyleGeometryBox::Fill) ==
-                    static_cast<uint8_t>(StyleImageLayerOrigin::Fill) &&
-                    static_cast<uint8_t>(StyleGeometryBox::Stroke) ==
-                    static_cast<uint8_t>(StyleImageLayerOrigin::Stroke) &&
-                    static_cast<uint8_t>(StyleGeometryBox::View) ==
-                    static_cast<uint8_t>(StyleImageLayerOrigin::View),
-                    "bg-clip and bg-origin style constants must agree");
       aValue.Append(char16_t(' '));
       origin->mValue.AppendToString(aTable[nsStyleImageLayers::origin], aValue,
                                     aSerialization);
 
       if (clip->mValue != origin->mValue) {
         aValue.Append(char16_t(' '));
         clip->mValue.AppendToString(aTable[nsStyleImageLayers::clip], aValue,
                                     aSerialization);
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -12450,31 +12450,16 @@ CSSParserImpl::ParseImageLayersItem(
         const KTableEntry* clipTable = nsCSSProps::kKeywordTableTable[aTable[nsStyleImageLayers::clip]];
         for (size_t i = 0; originTable[i].mValue != -1; i++) {
           // For each keyword & value in kOriginKTable, ensure that
           // kBackgroundKTable has a matching entry at the same position.
           MOZ_ASSERT(originTable[i].mKeyword == clipTable[i].mKeyword);
           MOZ_ASSERT(originTable[i].mValue == clipTable[i].mValue);
         }
 #endif
-        static_assert(static_cast<uint8_t>(StyleGeometryBox::Content) ==
-                      static_cast<uint8_t>(StyleImageLayerOrigin::Content) &&
-                      static_cast<uint8_t>(StyleGeometryBox::Padding) ==
-                      static_cast<uint8_t>(StyleImageLayerOrigin::Padding) &&
-                      static_cast<uint8_t>(StyleGeometryBox::Border) ==
-                      static_cast<uint8_t>(StyleImageLayerOrigin::Border) &&
-                      static_cast<uint8_t>(StyleGeometryBox::Margin) ==
-                      static_cast<uint8_t>(StyleImageLayerOrigin::Margin) &&
-                      static_cast<uint8_t>(StyleGeometryBox::Fill) ==
-                      static_cast<uint8_t>(StyleImageLayerOrigin::Fill) &&
-                      static_cast<uint8_t>(StyleGeometryBox::Stroke) ==
-                      static_cast<uint8_t>(StyleImageLayerOrigin::Stroke) &&
-                      static_cast<uint8_t>(StyleGeometryBox::View) ==
-                      static_cast<uint8_t>(StyleImageLayerOrigin::View),
-                      "bg-clip and bg-origin style constants must agree");
 
         CSSParseResult result =
           ParseSingleValueProperty(aState.mClip->mValue,
                                    aTable[nsStyleImageLayers::clip]);
         MOZ_ASSERT(result != CSSParseResult::Error,
                    "how can failing to parse a single background-clip value "
                    "consume tokens?");
         if (result == CSSParseResult::NotFound) {