Backed out changeset f713977f1629 (bug 1403694) for crashing in Android mochitests, e.g. layout/style/test/test_additional_sheets.html. r=backout

layout/base/nsStyleSheetService.cpp

@@ -251,23 +251,23 @@ nsStyleSheetService::LoadAndRegisterSheetInternal(nsIURI *aSheetURI,
   nsresult rv;
 
   RefPtr<StyleSheet> geckoSheet;
+  RefPtr<StyleSheet> servoSheet;
 
   rv = LoadSheet(aSheetURI, parsingMode, StyleBackendType::Gecko, &geckoSheet);
   NS_ENSURE_SUCCESS(rv, rv);
   MOZ_ASSERT(geckoSheet);
-  mGeckoSheets[aSheetType].AppendElement(geckoSheet);
 
 #ifdef MOZ_STYLO
   if (nsLayoutUtils::StyloSupportedInCurrentProcess()) {
-    RefPtr<StyleSheet> servoSheet;
-
     rv = LoadSheet(aSheetURI, parsingMode, StyleBackendType::Servo, &servoSheet);
     NS_ENSURE_SUCCESS(rv, rv);
     MOZ_ASSERT(servoSheet);
-    mServoSheets[aSheetType].AppendElement(servoSheet);
   }
 #endif
 
+  mGeckoSheets[aSheetType].AppendElement(geckoSheet);
+  mServoSheets[aSheetType].AppendElement(servoSheet);
+
   return NS_OK;
 }