Bug 1395486 - Move resource://gre-resource/plaintext.css to resource://content-accessible/plaintext.css. draft
authorChung-Sheng Fu <cfu@mozilla.com>
Thu, 31 Aug 2017 17:06:22 +0800
changeset 656475 101ac37abcabea60e5006ea09bf4365a6491e392
parent 656346 04b6be50a2526c7a26a63715f441c47e1aa1f9be
child 729170 8f868fa05cc84cca4574ad586d1fa79d0986bd71
push id77244
push userbmo:cfu@mozilla.com
push dateThu, 31 Aug 2017 09:17:15 +0000
bugs1395486
milestone57.0a1
Bug 1395486 - Move resource://gre-resource/plaintext.css to resource://content-accessible/plaintext.css. MozReview-Commit-ID: Efz2Z78W2ix
layout/style/jar.mn
layout/style/moz.build
parser/html/nsHtml5PlainTextUtils.cpp
--- a/layout/style/jar.mn
+++ b/layout/style/jar.mn
@@ -1,17 +1,16 @@
 # 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:
 *  res/ua.css                                (res/ua.css)
 *  res/html.css                              (res/html.css)
    res/quirk.css                             (res/quirk.css)
-   res/plaintext.css                         (res/plaintext.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/number-control.css                    (res/number-control.css)
    res/arrow.gif                             (res/arrow.gif)
    res/arrow-left.gif                        (res/arrow-left.gif)
    res/arrow-right.gif                       (res/arrow-right.gif)
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -299,16 +299,17 @@ JAR_MANIFESTS += ['jar.mn']
 
 RESOURCE_FILES += [
     'contenteditable.css',
     'designmode.css',
 ]
 
 CONTENT_ACCESSIBLE_FILES += [
     'ImageDocument.css',
+    'res/plaintext.css',
     'res/viewsource.css',
     'TopLevelImageDocument.css',
     'TopLevelVideoDocument.css',
 ]
 
 GENERATED_FILES += [
     'nsStyleStructList.h',
 ]
--- a/parser/html/nsHtml5PlainTextUtils.cpp
+++ b/parser/html/nsHtml5PlainTextUtils.cpp
@@ -17,17 +17,17 @@ nsHtml5PlainTextUtils::NewLinkAttributes
 {
   nsHtml5HtmlAttributes* linkAttrs = new nsHtml5HtmlAttributes(0);
   nsHtml5String rel =
     nsHtml5Portability::newStringFromLiteral("alternate stylesheet");
   linkAttrs->addAttribute(nsHtml5AttributeName::ATTR_REL, rel, -1);
   nsHtml5String type = nsHtml5Portability::newStringFromLiteral("text/css");
   linkAttrs->addAttribute(nsHtml5AttributeName::ATTR_TYPE, type, -1);
   nsHtml5String href = nsHtml5Portability::newStringFromLiteral(
-    "resource://gre-resources/plaintext.css");
+    "resource://content-accessible/plaintext.css");
   linkAttrs->addAttribute(nsHtml5AttributeName::ATTR_HREF, href, -1);
 
   nsresult rv;
   nsCOMPtr<nsIStringBundleService> bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
   NS_ASSERTION(NS_SUCCEEDED(rv) && bundleService, "The bundle service could not be loaded");
   nsCOMPtr<nsIStringBundle> bundle;
   rv = bundleService->CreateBundle("chrome://global/locale/browser.properties",
                                    getter_AddRefs(bundle));