Bug 1470873 - Part 1 - Remove support for "components.css". r=bzbarsky

Differential Revision: https://phabricator.services.mozilla.com/D12029

--HG--
extra : rebase_source : e8528a8f04fd888112c4c9e800d0439e07beacd4

layout/base/nsDocumentViewer.cpp

@@ -2468,13 +2468,7 @@ nsDocumentViewer::CreateStyleSet(nsIDocument* aDocument)
     styleSet->PrependStyleSheet(SheetType::Agent, sheet);
   }
 
-  // This is the only place components.css / xul.css get loaded.
   if (aDocument->LoadsFullXULStyleSheetUpFront()) {
-    sheet = cache->XULComponentsSheet();
-    if (sheet) {
-      styleSet->PrependStyleSheet(SheetType::Agent, sheet);
-    }
-
     sheet = cache->XULSheet();
     if (sheet) {
       styleSet->PrependStyleSheet(SheetType::Agent, sheet);

layout/style/nsLayoutStylesheetCache.cpp

@@ -136,17 +136,6 @@ nsLayoutStylesheetCache::XULSheet()
   return mXULSheet;
 }
 
-StyleSheet*
-nsLayoutStylesheetCache::XULComponentsSheet()
-{
-  if (!mXULComponentsSheet) {
-    LoadSheetURL("chrome://global/content/components.css",
-                 &mXULComponentsSheet, eAgentSheetFeatures, eCrash);
-  }
-
-  return mXULComponentsSheet;
-}
-
 StyleSheet*
 nsLayoutStylesheetCache::QuirkSheet()
 {
@@ -297,7 +286,6 @@ nsLayoutStylesheetCache::SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf
   MEASURE(mUserChromeSheet);
   MEASURE(mUserContentSheet);
   MEASURE(mXULSheet);
-  MEASURE(mXULComponentsSheet);
 
   // Measurement of the following members may be added later if DMD finds it is
   // worthwhile:
@@ -336,7 +324,6 @@ nsLayoutStylesheetCache::nsLayoutStylesheetCache()
   if (XRE_IsParentProcess()) {
     // We know we need xul.css for the UI, so load that now too:
     XULSheet();
-    XULComponentsSheet();
   }
 
   if (gUserContentSheetURL) {

layout/style/nsLayoutStylesheetCache.h

@@ -51,7 +51,6 @@ class nsLayoutStylesheetCache final
   mozilla::StyleSheet* HTMLSheet();
   mozilla::StyleSheet* MinimalXULSheet();
   mozilla::StyleSheet* XULSheet();
-  mozilla::StyleSheet* XULComponentsSheet();
   mozilla::StyleSheet* QuirkSheet();
   mozilla::StyleSheet* SVGSheet();
   mozilla::StyleSheet* MathMLSheet();
@@ -112,7 +111,6 @@ private:
   RefPtr<mozilla::StyleSheet> mUserChromeSheet;
   RefPtr<mozilla::StyleSheet> mUserContentSheet;
   RefPtr<mozilla::StyleSheet> mXULSheet;
-  RefPtr<mozilla::StyleSheet> mXULComponentsSheet;
 };
 
 #endif

toolkit/content/components.css

@@ -1,14 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* ===== components.css ==================================================
-   ==
-   == THESE STYLES HAVE BEEN MOVED TO "widgets.css".
-   ==
-   == This file exists to allow debugging regressions more easily using
-   == just artifact builds, and will be removed in bug 1470873.
-   ==
-   ======================================================================= */
-
-

toolkit/content/jar.mn

@@ -3,7 +3,6 @@ toolkit.jar:
 *  content/global/license.html
    content/global/minimal-xul.css
 *  content/global/xul.css
-   content/global/components.css
    content/global/autocomplete.css
    content/global/aboutAbout.js
    content/global/aboutAbout.xhtml