Bug 1519737 - Move pluginProblemBinding.css to the UA style sheet cache. r=emilio,timdream

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

--HG--
rename : toolkit/pluginproblem/content/pluginProblemBinding.css => layout/style/res/pluginproblem.css
extra : moz-landing-system : lando

browser/base/content/test/static/browser_parsable_css.js

@@ -32,7 +32,7 @@ let whitelist = [
    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,

browser/installer/package-manifest.in

@@ -235,7 +235,6 @@
 @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

layout/base/nsDocumentViewer.cpp

@@ -2347,9 +2347,9 @@ UniquePtr<ServoStyleSet> nsDocumentViewer::CreateStyleSet(Document* aDocument) {
     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);

layout/style/UserAgentStyleSheetList.h

@@ -28,6 +28,7 @@ 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)

layout/style/jar.mn

@@ -10,6 +10,7 @@ toolkit.jar:
    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)

mobile/android/installer/package-manifest.in

@@ -167,7 +167,6 @@
 @BINPATH@/components/nsUpdateTimerManager.manifest
 @BINPATH@/components/nsUpdateTimerManager.js
 
-@BINPATH@/components/pluginGlue.manifest
 @BINPATH@/components/ProcessSingleton.manifest
 @BINPATH@/components/MainProcessSingleton.js
 @BINPATH@/components/ContentProcessSingleton.js

toolkit/pluginproblem/jar.mn

@@ -6,4 +6,3 @@ 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)

toolkit/pluginproblem/moz.build

@@ -4,8 +4,4 @@
 # 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']

toolkit/pluginproblem/pluginGlue.manifest

@@ -1 +0,0 @@
-category agent-style-sheets pluginGlue-pluginProblem chrome://pluginproblem/content/pluginProblemBinding.css