Bug 1516211 - Use UserAgentStyleSheetList.h to declare StyleSheet members on nsLayoutStylesheetCache r=emilio
authorCameron McCormack <cam@mcc.id.au>
Mon, 24 Dec 2018 01:34:37 +0000
changeset 508977 68d308ba966c683641c4edc93d418fbb4eadd9f8
parent 508976 8c35900a1c7291259f88caafc8a1f5a9345902d1
child 508985 b243a5a3fc646329ca5b5d169f7fe2f16dfb56eb
child 508987 fbfede2557f7bf964c6b106b60949a272d0c83b6
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemilio
bugs1516211
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1516211 - Use UserAgentStyleSheetList.h to declare StyleSheet members on nsLayoutStylesheetCache r=emilio Differential Revision: https://phabricator.services.mozilla.com/D15281
layout/style/nsLayoutStylesheetCache.h
--- a/layout/style/nsLayoutStylesheetCache.h
+++ b/layout/style/nsLayoutStylesheetCache.h
@@ -72,29 +72,21 @@ class nsLayoutStylesheetCache final : pu
                  mozilla::css::SheetParsingMode aParsingMode,
                  mozilla::css::FailureAction aFailureAction);
   void BuildPreferenceSheet(RefPtr<mozilla::StyleSheet>* aSheet,
                             nsPresContext* aPresContext);
 
   static mozilla::StaticRefPtr<nsLayoutStylesheetCache> gStyleCache;
   static mozilla::StaticRefPtr<mozilla::css::Loader> gCSSLoader;
   static mozilla::StaticRefPtr<nsIURI> gUserContentSheetURL;
+
+#define STYLE_SHEET(identifier_, url_, lazy_) \
+  RefPtr<mozilla::StyleSheet> m##identifier_##Sheet;
+#include "mozilla/UserAgentStyleSheetList.h"
+#undef STYLE_SHEET
+
   RefPtr<mozilla::StyleSheet> mChromePreferenceSheet;
-  RefPtr<mozilla::StyleSheet> mContentEditableSheet;
   RefPtr<mozilla::StyleSheet> mContentPreferenceSheet;
-  RefPtr<mozilla::StyleSheet> mCounterStylesSheet;
-  RefPtr<mozilla::StyleSheet> mDesignModeSheet;
-  RefPtr<mozilla::StyleSheet> mFormsSheet;
-  RefPtr<mozilla::StyleSheet> mHTMLSheet;
-  RefPtr<mozilla::StyleSheet> mMathMLSheet;
-  RefPtr<mozilla::StyleSheet> mMinimalXULSheet;
-  RefPtr<mozilla::StyleSheet> mNoFramesSheet;
-  RefPtr<mozilla::StyleSheet> mNoScriptSheet;
-  RefPtr<mozilla::StyleSheet> mQuirkSheet;
-  RefPtr<mozilla::StyleSheet> mSVGSheet;
-  RefPtr<mozilla::StyleSheet> mScrollbarsSheet;
-  RefPtr<mozilla::StyleSheet> mUASheet;
   RefPtr<mozilla::StyleSheet> mUserChromeSheet;
   RefPtr<mozilla::StyleSheet> mUserContentSheet;
-  RefPtr<mozilla::StyleSheet> mXULSheet;
 };
 
 #endif