Bug 1343964 followup - Add back code change which was incorrectly dropped when addressing review comment on a CLOSED TREE.
authorXidorn Quan <me@upsuper.org>
Fri, 07 Apr 2017 13:56:03 +1000
changeset 558321 9c639ec492e57bb372b1d0bdb31c2a57dccad043
parent 558320 1872baf8c37e1f2fd3630c4fb63cb84d950c86af
child 558322 ee04556f7cbb7b4e0f0fa0352c08cd94e67d11de
push id52860
push userbmo:walkingice0204@gmail.com
push dateFri, 07 Apr 2017 13:29:26 +0000
bugs1343964
milestone55.0a1
Bug 1343964 followup - Add back code change which was incorrectly dropped when addressing review comment on a CLOSED TREE. MozReview-Commit-ID: Kwehpac1Dia
layout/style/nsDOMCSSDeclaration.cpp
--- a/layout/style/nsDOMCSSDeclaration.cpp
+++ b/layout/style/nsDOMCSSDeclaration.cpp
@@ -322,20 +322,17 @@ nsDOMCSSDeclaration::ModifyDeclaration(G
   // rule (see stack in bug 209575).
   mozAutoDocConditionalContentUpdateBatch autoUpdate(DocToUpdate(), true);
   RefPtr<DeclarationBlock> decl = olddecl->EnsureMutable();
 
   bool changed;
   if (decl->IsGecko()) {
     aGeckoFunc(decl->AsGecko(), env, &changed);
   } else {
-    // FIXME (bug 1343964): Figure out a better solution for sending the base uri to servo
-    RefPtr<URLExtraData> data =
-      new URLExtraData(env.mBaseURI, env.mSheetURI, env.mPrincipal);
-    changed = aServoFunc(decl->AsServo(), data);
+    changed = aServoFunc(decl->AsServo(), urlData);
   }
   if (!changed) {
     // Parsing failed -- but we don't throw an exception for that.
     return NS_OK;
   }
 
   return SetCSSDeclaration(decl);
 }