Bug 1445089 - Revert workaround for a VS2017 <15.6 constexpr pointer math bug. r?dmajor draft
authorBryce Van Dyk <bvandyk@mozilla.com>
Thu, 15 Mar 2018 11:36:56 -0400
changeset 768043 d7e4a9eca79f388a718244677611ecce184b6611
parent 760935 ee326c976eebdca48128054022c443d3993e12b0
push id102792
push userbvandyk@mozilla.com
push dateThu, 15 Mar 2018 17:23:58 +0000
reviewersdmajor
bugs1445089, 1408695, 1424281
milestone60.0a1
Bug 1445089 - Revert workaround for a VS2017 <15.6 constexpr pointer math bug. r?dmajor Bug 1408695 introduced a workaround in HTMLTrackElement for a bug in VS2017 < 15.6. Bug 1424281 bumps our minimum support versions so the workaround can be removed. MozReview-Commit-ID: 9aZb9ODPIlh
dom/html/HTMLTrackElement.cpp
--- a/dom/html/HTMLTrackElement.cpp
+++ b/dom/html/HTMLTrackElement.cpp
@@ -64,17 +64,17 @@ static constexpr nsAttrValue::EnumTable 
   { "descriptions", static_cast<int16_t>(TextTrackKind::Descriptions) },
   { "chapters", static_cast<int16_t>(TextTrackKind::Chapters) },
   { "metadata", static_cast<int16_t>(TextTrackKind::Metadata) },
   { nullptr, 0 }
 };
 
 // Invalid values are treated as "metadata" in ParseAttribute, but if no value
 // at all is specified, it's treated as "subtitles" in GetKind
-static const nsAttrValue::EnumTable* const kKindTableInvalidValueDefault = &kKindTable[4];
+static constexpr const nsAttrValue::EnumTable* kKindTableInvalidValueDefault = &kKindTable[4];
 
 class WindowDestroyObserver final : public nsIObserver
 {
   NS_DECL_ISUPPORTS
 
 public:
   explicit WindowDestroyObserver(HTMLTrackElement* aElement, uint64_t aWinID)
     : mTrackElement(aElement)