Bug 1367293 - Explicitly cast nsStyleContext* to nullptr. r=birtles
authorHiroyuki Ikezoe <hikezoe@mozilla.com>
Fri, 02 Jun 2017 09:37:55 +0900
changeset 410070 d820ab5d75a6093b243ec0f005bec3ba9bf7cb09
parent 410069 39e5304d676d83cf44964a95dee97b9c9abd10cb
child 410071 ebb95a9089b1154480fa96a0a17e1ac69086ab42
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbirtles
bugs1367293
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1367293 - Explicitly cast nsStyleContext* to nullptr. r=birtles In subsequent patches, the servo version of KeyframeUtils::ApplySpacing() changes fifth argument to const ServoComputedValues*. If we still use nullptr for the fifth argument in caller side, compilers can't determine whether nsStyleContext* or const ServoComputedValues* should be used. MozReview-Commit-ID: 1bE2cA7gRdi
dom/animation/KeyframeUtils.cpp
--- a/dom/animation/KeyframeUtils.cpp
+++ b/dom/animation/KeyframeUtils.cpp
@@ -583,18 +583,19 @@ KeyframeUtils::ApplySpacing(nsTArray<Key
     keyframeA = keyframeB;
   }
 }
 
 /* static */ void
 KeyframeUtils::ApplyDistributeSpacing(nsTArray<Keyframe>& aKeyframes)
 {
   nsTArray<ComputedKeyframeValues> emptyArray;
+  // FIXME: Bug 1339690: below static_cast should be dropped.
   ApplySpacing(aKeyframes, SpacingMode::distribute, eCSSProperty_UNKNOWN,
-               emptyArray, nullptr);
+               emptyArray, static_cast<nsStyleContext*>(nullptr));
 }
 
 /* static */ nsTArray<ComputedKeyframeValues>
 KeyframeUtils::GetComputedKeyframeValues(
   const nsTArray<Keyframe>& aKeyframes,
   dom::Element* aElement,
   const ServoComputedValuesWithParent& aServoValues)
 {