Bug 1519737 - Move pluginProblemBinding.css to the UA style sheet cache. r=emilio,timdream
☠☠ backed out by 54b883fea35a ☠ ☠
authorCameron McCormack <cam@mcc.id.au>
Mon, 14 Jan 2019 21:51:59 +0000
changeset 497775 a85699150a8b513d42dc4eab0e17b7bd9926190b
parent 497774 557a23aec3afb838fbcf1b80e1228fa3a3182380
child 497776 6e9eaee838be152b9680da2a1ea11b9418713b15
push idunknown
push userunknown
push dateunknown
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/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/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