Bug 1290214 - Remove NS_ERROR in the case where we skip checking the stylesheet service. r=emilio
authorBobby Holley <bobbyholley@gmail.com>
Thu, 28 Jul 2016 12:38:06 -0700
changeset 332266 31aaf3f16d985b14f8244a96de61af4104a95394
parent 332265 5980af5a8eb750c8bcd15467aedbcfbbb5d0d958
child 332267 bfe87f58256d3d7560f7e2d37a835bd1d4efaef2
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemilio
bugs1290214
milestone50.0a1
Bug 1290214 - Remove NS_ERROR in the case where we skip checking the stylesheet service. r=emilio
dom/base/nsDocument.cpp
layout/base/nsDocumentViewer.cpp
--- a/dom/base/nsDocument.cpp
+++ b/dom/base/nsDocument.cpp
@@ -2420,17 +2420,18 @@ nsDocument::FillStyleSet(StyleSetHandle 
 
     // Iterate backwards to maintain order
     for (StyleSheetHandle sheet : Reversed(mOnDemandBuiltInUASheets)) {
       if (sheet->IsApplicable()) {
         aStyleSet->PrependStyleSheet(SheetType::Agent, sheet);
       }
     }
   } else {
-    NS_ERROR("stylo: nsStyleSheetService doesn't handle ServoStyleSheets yet");
+    NS_WARNING("stylo: Not yet checking nsStyleSheetService for Servo-backed "
+               "documents. See bug 1290224");
   }
 
   AppendSheetsToStyleSet(aStyleSet, mAdditionalSheets[eAgentSheet],
                          SheetType::Agent);
   AppendSheetsToStyleSet(aStyleSet, mAdditionalSheets[eUserSheet],
                          SheetType::User);
   AppendSheetsToStyleSet(aStyleSet, mAdditionalSheets[eAuthorSheet],
                          SheetType::Doc);
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -2342,17 +2342,18 @@ nsDocumentViewer::CreateStyleSet(nsIDocu
       for (StyleSheetHandle sheet : *sheetService->AgentStyleSheets()) {
         styleSet->AppendStyleSheet(SheetType::Agent, sheet);
       }
       for (StyleSheetHandle sheet : Reversed(*sheetService->UserStyleSheets())) {
         styleSet->PrependStyleSheet(SheetType::User, sheet);
       }
     }
   } else {
-    NS_ERROR("stylo: nsStyleSheetService doesn't handle ServoStyleSheets yet");
+    NS_WARNING("stylo: Not yet checking nsStyleSheetService for Servo-backed "
+               "documents. See bug 1290224");
   }
 
   // Caller will handle calling EndUpdate, per contract.
   return styleSet;
 }
 
 NS_IMETHODIMP
 nsDocumentViewer::ClearHistoryEntry()