author | Chung-Sheng Fu <cfu@mozilla.com> |
Thu, 31 Aug 2017 17:06:22 +0800 | |
changeset 414753 | f3f991da060a6acf04c78a3a70e3fc2b35ddc9e1 |
parent 414752 | d8676b5208a5528fb7caea39f88a50ebda34ef27 |
child 414754 | bafae81b6c529db3fa3ac3dada0407d880f237f9 |
push id | unknown |
push user | unknown |
push date | unknown |
reviewers | heycam |
bugs | 1395486 |
milestone | 57.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
|
--- 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));