Bug 1298774 - followup: fix compile error by disable mask-as-shorthand. r=me
authorcku <cku@mozilla.com>
Wed, 09 Nov 2016 18:54:44 +0800
changeset 352004 cf26d9dfd60045d21c675072a075965d6d395c92
parent 352003 383a0c1435ef4a29e7f36a4c47d6b3954e8f01fe
child 352005 142d256dc5f37fee41ae2f91a8be31233ff35e68
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1298774
milestone52.0a1
Bug 1298774 - followup: fix compile error by disable mask-as-shorthand. r=me MozReview-Commit-ID: 99is2akQI3k
layout/style/nsRuleNode.cpp
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -10046,21 +10046,21 @@ nsRuleNode::ComputeSVGResetData(void* aS
 
   if (rebuild) {
     FillAllBackgroundLists(svgReset->mMask, maxItemCount);
   }
 #else
   // mask: none | <url>
   const nsCSSValue* maskValue = aRuleData->ValueForMask();
   if (eCSSUnit_URL == maskValue->GetUnit()) {
-    svgReset->mMask.mLayers[0].mSourceURI.SetValue(maskValue);
+    svgReset->mMask.mLayers[0].mSourceURI = maskValue->GetURLStructValue();
   } else if (eCSSUnit_None == maskValue->GetUnit() ||
              eCSSUnit_Initial == maskValue->GetUnit() ||
              eCSSUnit_Unset == maskValue->GetUnit()) {
-    svgReset->mMask.mLayers[0].mSourceURI.SetNull();
+    svgReset->mMask.mLayers[0].mSourceURI = nullptr;
   } else if (eCSSUnit_Inherit == maskValue->GetUnit()) {
     conditions.SetUncacheable();
     svgReset->mMask.mLayers[0].mSourceURI =
       parentSVGReset->mMask.mLayers[0].mSourceURI;
   }
 #endif
 
   COMPUTE_END_RESET(SVGReset, svgReset)