Bug 1519737 - Move pluginProblemBinding.css to the UA style sheet cache. r=emilio,timdream
authorCameron McCormack <cam@mcc.id.au>
Wed, 16 Jan 2019 03:37:43 +0000
changeset 514037 79c6f7924680f978c9205df25653a16cec378e21
parent 514036 493f7ee0ee0069fb0005ad61002e04ed3ff80fe8
child 514038 8cef8c45741cb04fc769f56d3d6bd5a42a918685
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemilio, timdream
bugs1519737
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 1519737 - Move pluginProblemBinding.css to the UA style sheet cache. r=emilio,timdream Differential Revision: https://phabricator.services.mozilla.com/D16430
browser/base/content/test/static/browser_parsable_css.js
browser/installer/package-manifest.in
layout/base/nsDocumentViewer.cpp
layout/style/UserAgentStyleSheetList.h
layout/style/jar.mn
layout/style/res/pluginproblem.css
mobile/android/installer/package-manifest.in
toolkit/pluginproblem/content/pluginProblemBinding.css
toolkit/pluginproblem/jar.mn
toolkit/pluginproblem/moz.build
toolkit/pluginproblem/pluginGlue.manifest
--- a/browser/base/content/test/static/browser_parsable_css.js
+++ b/browser/base/content/test/static/browser_parsable_css.js
@@ -27,17 +27,17 @@ let whitelist = [
   {sourceName: /highlighters\.css$/i,
    errorMessage: /Unknown pseudo-class.*moz-native-anonymous/i,
    isFromDevTools: true},
   // UA-only media features.
   {sourceName: /\b(autocomplete-item|svg)\.css$/,
    errorMessage: /Expected media feature name but found \u2018-moz.*/i,
    isFromDevTools: false},
 
-  {sourceName: /\b(contenteditable|EditorOverride|svg|forms|html|mathml|ua)\.css$/i,
+  {sourceName: /\b(contenteditable|EditorOverride|svg|forms|html|mathml|ua|pluginproblem)\.css$/i,
    errorMessage: /Unknown pseudo-class.*-moz-/i,
    isFromDevTools: false},
   {sourceName: /\b(html|mathml|ua)\.css$/i,
    errorMessage: /Unknown property.*-moz-/i,
    isFromDevTools: false},
   // Reserved to UA sheets unless layout.css.overflow-clip-box.enabled flipped to true.
   {sourceName: /(?:res|gre-resources)\/forms\.css$/i,
    errorMessage: /Unknown property.*overflow-clip-box/i,
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -230,17 +230,16 @@
 @RESPATH@/components/nsUpdateService.manifest
 @RESPATH@/components/nsUpdateService.js
 @RESPATH@/components/nsUpdateServiceStub.js
 #endif
 @RESPATH@/components/nsUpdateTimerManager.manifest
 @RESPATH@/components/nsUpdateTimerManager.js
 @RESPATH@/components/utils.manifest
 @RESPATH@/components/simpleServices.js
-@RESPATH@/components/pluginGlue.manifest
 @RESPATH@/components/ProcessSingleton.manifest
 @RESPATH@/components/MainProcessSingleton.js
 @RESPATH@/components/ContentProcessSingleton.js
 @RESPATH@/components/nsURLFormatter.manifest
 @RESPATH@/components/nsURLFormatter.js
 @RESPATH@/components/toolkitplaces.manifest
 @RESPATH@/components/nsTaggingService.js
 @RESPATH@/components/UnifiedComplete.js
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -2342,19 +2342,19 @@ UniquePtr<ServoStyleSet> nsDocumentViewe
   // that non-XUL (typically HTML) documents commonly use.
   styleSet->AppendStyleSheet(SheetType::Agent, cache->MinimalXULSheet());
 
   // Only load the full XUL sheet if we'll need it.
   if (aDocument->LoadsFullXULStyleSheetUpFront()) {
     styleSet->AppendStyleSheet(SheetType::Agent, cache->XULSheet());
   }
 
-  // Append chrome sheets (scrollbars + forms).
   styleSet->AppendStyleSheet(SheetType::Agent, cache->FormsSheet());
   styleSet->AppendStyleSheet(SheetType::Agent, cache->ScrollbarsSheet());
+  styleSet->AppendStyleSheet(SheetType::Agent, cache->PluginProblemSheet());
 
   for (StyleSheet* sheet : *sheetService->AgentStyleSheets()) {
     styleSet->AppendStyleSheet(SheetType::Agent, sheet);
   }
 
   return styleSet;
 }
 
--- a/layout/style/UserAgentStyleSheetList.h
+++ b/layout/style/UserAgentStyleSheetList.h
@@ -23,13 +23,14 @@ STYLE_SHEET(ContentEditable, "resource:/
 STYLE_SHEET(CounterStyles, "resource://gre-resources/counterstyles.css", false)
 STYLE_SHEET(DesignMode, "resource://gre/res/designmode.css", true)
 STYLE_SHEET(Forms, "resource://gre-resources/forms.css", true)
 STYLE_SHEET(HTML, "resource://gre-resources/html.css", false)
 STYLE_SHEET(MathML, "resource://gre-resources/mathml.css", true)
 STYLE_SHEET(MinimalXUL, "chrome://global/content/minimal-xul.css", false)
 STYLE_SHEET(NoFrames, "resource://gre-resources/noframes.css", true)
 STYLE_SHEET(NoScript, "resource://gre-resources/noscript.css", true)
+STYLE_SHEET(PluginProblem, "resource://gre-resources/pluginproblem.css", true)
 STYLE_SHEET(Quirk, "resource://gre-resources/quirk.css", false)
 STYLE_SHEET(Scrollbars, "chrome://global/skin/scrollbars.css", true)
 STYLE_SHEET(SVG, "resource://gre/res/svg.css", false)
 STYLE_SHEET(UA, "resource://gre-resources/ua.css", true)
 STYLE_SHEET(XUL, "chrome://global/content/xul.css", true)
--- a/layout/style/jar.mn
+++ b/layout/style/jar.mn
@@ -5,16 +5,17 @@
 toolkit.jar:
 *  res/ua.css                                (res/ua.css)
 *  res/html.css                              (res/html.css)
    res/quirk.css                             (res/quirk.css)
    res/counterstyles.css                     (res/counterstyles.css)
    res/noscript.css                          (res/noscript.css)
    res/noframes.css                          (res/noframes.css)
 *  res/forms.css                             (res/forms.css)
+   res/pluginproblem.css                     (res/pluginproblem.css)
    res/arrow.gif                             (res/arrow.gif)
    res/arrow-left.gif                        (res/arrow-left.gif)
    res/arrow-right.gif                       (res/arrow-right.gif)
    res/arrowd.gif                            (res/arrowd.gif)
    res/arrowd-left.gif                       (res/arrowd-left.gif)
    res/arrowd-right.gif                      (res/arrowd-right.gif)
    res/accessiblecaret-normal@1x.png         (res/accessiblecaret-normal@1x.png)
    res/accessiblecaret-normal@1.5x.png       (res/accessiblecaret-normal@1.5x.png)
rename from toolkit/pluginproblem/content/pluginProblemBinding.css
rename to layout/style/res/pluginproblem.css
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -162,17 +162,16 @@
 #endif
 
 @BINPATH@/components/ClearDataService.manifest
 @BINPATH@/components/ClearDataService.js
 
 @BINPATH@/components/nsUpdateTimerManager.manifest
 @BINPATH@/components/nsUpdateTimerManager.js
 
-@BINPATH@/components/pluginGlue.manifest
 @BINPATH@/components/ProcessSingleton.manifest
 @BINPATH@/components/MainProcessSingleton.js
 @BINPATH@/components/ContentProcessSingleton.js
 @BINPATH@/components/nsURLFormatter.manifest
 @BINPATH@/components/nsURLFormatter.js
 @BINPATH@/components/ContentPrefService2.manifest
 @BINPATH@/components/ContentPrefService2.js
 @BINPATH@/components/HandlerService.manifest
--- a/toolkit/pluginproblem/jar.mn
+++ b/toolkit/pluginproblem/jar.mn
@@ -1,9 +1,8 @@
 # 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/.
 
 toolkit.jar:
 % content pluginproblem %pluginproblem/ contentaccessible=yes
   pluginproblem/pluginProblem.xml                 (content/pluginProblem.xml)
   pluginproblem/pluginProblemContent.css          (content/pluginProblemContent.css)
-  pluginproblem/pluginProblemBinding.css          (content/pluginProblemBinding.css)
--- a/toolkit/pluginproblem/moz.build
+++ b/toolkit/pluginproblem/moz.build
@@ -1,11 +1,7 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
-EXTRA_COMPONENTS += [
-    'pluginGlue.manifest',
-]
-
 JAR_MANIFESTS += ['jar.mn']
deleted file mode 100644
--- a/toolkit/pluginproblem/pluginGlue.manifest
+++ /dev/null
@@ -1,1 +0,0 @@
-category agent-style-sheets pluginGlue-pluginProblem chrome://pluginproblem/content/pluginProblemBinding.css