corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1959147) for causing build bustages @txMozillaXSLTProcessor.cpp. CLOSED TREE

Browse Source 
Backed out changeset a019651cc743 (bug 1959147)
Backed out changeset d57f3a859955 (bug 1959147)
This commit is contained in:
Goloman Adrian
2025-04-28 12:20:37 +03:00
parent db34c619e8
commit 06a37705e3
12 changed files with 174 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
browser/base/content/test/static/browser_all_files_referenced.js
View File

@@ -329,9 +329,6 @@ var allowlist = [
file: "resource://gre/localization/en-US/netwerk/necko.ftl",
},
// dom/xslt/xslt/txMozillaXSLTProcessor.cpp
{ file: "resource://gre/localization/en-US/dom/xslt.ftl" },
// A QA and dev debug tool.
{ file: "chrome://browser/content/places/interactionsViewer.html" },
];

5
dom/locales/en-US/chrome/global-strres.properties Normal file
View File

@@ -0,0 +1,5 @@
# 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/.
16389=An unknown error has occurred (%1$S)

39
dom/locales/en-US/chrome/xslt/xslt.properties Normal file
View File

@@ -0,0 +1,39 @@
# 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/.
1 = Parsing an XSLT stylesheet failed.
2 = Parsing an XPath expression failed.
3 =
4 = XSLT transformation failed.
5 = Invalid XSLT/XPath function.
6 = XSLT Stylesheet (possibly) contains a recursion.
7 = Attribute value illegal in XSLT 1.0.
8 = An XPath expression was expected to return a NodeSet.
9 = XSLT transformation was terminated by <xsl:message>.
10 = A network error occurred loading an XSLT stylesheet:
11 = An XSLT stylesheet does not have an XML mimetype:
12 = An XSLT stylesheet directly or indirectly imports or includes itself:
13 = An XPath function was called with the wrong number of arguments.
14 = An unknown XPath extension function was called.
15 = XPath parse failure: ‘)’ expected:
16 = XPath parse failure: invalid axis:
17 = XPath parse failure: Name or Nodetype test expected:
18 = XPath parse failure: ‘]’ expected:
19 = XPath parse failure: invalid variable name:
20 = XPath parse failure: unexpected end of expression:
21 = XPath parse failure: operator expected:
22 = XPath parse failure: unclosed literal:
23 = XPath parse failure: ‘:’ unexpected:
24 = XPath parse failure: ‘!’ unexpected, negation is not():
25 = XPath parse failure: illegal character found:
26 = XPath parse failure: binary operator expected:
27 = An XSLT stylesheet load was blocked for security reasons.
28 = Evaluating an invalid expression.
29 = Unbalanced curly brace.
30 = Creating an element with an invalid QName.
31 = Variable binding shadows variable binding within the same template.
32 = Call to the key function not allowed.
LoadingError = Error loading stylesheet: %S
TransformError = Error during XSLT transformation: %S

51
dom/locales/en-US/dom/xslt.ftl
View File

@@ -1,51 +0,0 @@
# 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/.
## XSLT and XPath specific errors.
xslt-parse-failure = Parsing an XSLT stylesheet failed.
xpath-parse-failure = Parsing an XPath expression failed.
xslt-execution-failure = XSLT transformation failed.
xpath-unknown-function = Invalid XSLT/XPath function.
xslt-bad-recursion = XSLT Stylesheet (possibly) contains a recursion.
xslt-bad-value = Attribute value illegal in XSLT 1.0.
xslt-nodeset-expected = An XPath expression was expected to return a NodeSet.
xslt-aborted = XSLT transformation was terminated by <xsl:message>.
xslt-network-error = A network error occurred loading an XSLT stylesheet:
xslt-wrong-mime-type = An XSLT stylesheet does not have an XML mimetype:
xslt-load-recursion = An XSLT stylesheet directly or indirectly imports or includes itself:
xpath-bad-argument-count = An XPath function was called with the wrong number of arguments.
xpath-bad-extension-function = An unknown XPath extension function was called.
xpath-paren-expected = XPath parse failure: ‘)’ expected:
xpath-invalid-axis = XPath parse failure: invalid axis:
xpath-no-node-type-test = XPath parse failure: Name or Nodetype test expected:
xpath-bracket-expected = XPath parse failure: ‘]’ expected:
xpath-invalid-var-name = XPath parse failure: invalid variable name:
xpath-unexpected-end = XPath parse failure: unexpected end of expression:
xpath-operator-expected = XPath parse failure: operator expected:
xpath-unclosed-literal = XPath parse failure: unclosed literal:
xpath-bad-colon = XPath parse failure: ‘:’ unexpected:
xpath-bad-bang = XPath parse failure: ‘!’ unexpected, negation is not():
xpath-illegal-char = XPath parse failure: illegal character found:
xpath-binary-expected = XPath parse failure: binary operator expected:
xslt-load-blocked-error = An XSLT stylesheet load was blocked for security reasons.
xpath-invalid-expression-evaluated = Evaluating an invalid expression.
xpath-unbalanced-curly-brace = Unbalanced curly brace.
xslt-bad-node-name = Creating an element with an invalid QName.
xslt-var-already-set = Variable binding shadows variable binding within the same template.
xslt-call-to-key-not-allowed = Call to the key function not allowed.
# Other failures, not found in the previous ones.
# Variables:
# $errorCode (String) - The error code (formatted in hexadecimal)
xslt-unknown-error = An unknown error has occurred ({ $errorCode })
## Messages for the XML error page.
##
## Variables:
## $error (string) - the specific XSLT or XPath error (a translated string
## from the previous section)
xslt-loading-error = Error loading stylesheet: { $error }
xslt-transform-error = Error during XSLT transformation: { $error }

2
dom/locales/jar.mn
View File

@@ -12,7 +12,9 @@
locale/@AB_CD@/global/printing.properties (%chrome/layout/printing.properties)
locale/@AB_CD@/global/layout_errors.properties (%chrome/layout/layout_errors.properties)
locale/@AB_CD@/global/appstrings.properties (%chrome/appstrings.properties)
locale/@AB_CD@/global/global-strres.properties (%chrome/global-strres.properties)
locale/@AB_CD@/global/nsWebBrowserPersist.properties (%chrome/nsWebBrowserPersist.properties)
locale/@AB_CD@/global/xslt/xslt.properties (%chrome/xslt/xslt.properties)
locale/@AB_CD@/global/dom/dom.properties (%chrome/dom/dom.properties)
locale/@AB_CD@/global/svg/svg.properties (%chrome/svg/svg.properties)
locale/@AB_CD@/global/layout/MediaDocument.properties (%chrome/layout/MediaDocument.properties)

1
dom/xslt/xslt/moz.build
View File

@@ -6,6 +6,7 @@
EXPORTS.mozilla.dom += [
"txMozillaXSLTProcessor.h",
"txXSLTMsgsURL.h",
]
XPIDL_MODULE = "dom_xslt"

121
dom/xslt/xslt/txMozillaXSLTProcessor.cpp
View File

@@ -17,6 +17,7 @@
#include "txURIUtils.h"
#include "txXMLUtils.h"
#include "txUnknownHandler.h"
#include "txXSLTMsgsURL.h"
#include "txXSLTProcessor.h"
#include "nsIPrincipal.h"
#include "nsThreadUtils.h"
@@ -986,77 +987,6 @@ nsresult txMozillaXSLTProcessor::setStylesheet(txStylesheet* aStylesheet) {
return NS_OK;
}
static mozilla::Maybe<nsLiteralCString> StatusCodeToL10nId(nsresult aStatus) {
switch (aStatus) {
case NS_ERROR_XSLT_PARSE_FAILURE:
return mozilla::Some("xslt-parse-failure"_ns);
case NS_ERROR_XPATH_PARSE_FAILURE:
return mozilla::Some("xpath-parse-failure"_ns);
case NS_ERROR_XSLT_ALREADY_SET:
return mozilla::Some("xslt-var-already-set"_ns);
case NS_ERROR_XSLT_EXECUTION_FAILURE:
return mozilla::Some("xslt-execution-failure"_ns);
case NS_ERROR_XPATH_UNKNOWN_FUNCTION:
return mozilla::Some("xpath-unknown-function"_ns);
case NS_ERROR_XSLT_BAD_RECURSION:
return mozilla::Some("xslt-bad-recursion"_ns);
case NS_ERROR_XSLT_BAD_VALUE:
return mozilla::Some("xslt-bad-value"_ns);
case NS_ERROR_XSLT_NODESET_EXPECTED:
return mozilla::Some("xslt-nodeset-expected"_ns);
case NS_ERROR_XSLT_ABORTED:
return mozilla::Some("xslt-aborted"_ns);
case NS_ERROR_XSLT_NETWORK_ERROR:
return mozilla::Some("xslt-network-error"_ns);
case NS_ERROR_XSLT_WRONG_MIME_TYPE:
return mozilla::Some("xslt-wrong-mime-type"_ns);
case NS_ERROR_XSLT_LOAD_RECURSION:
return mozilla::Some("xslt-load-recursion"_ns);
case NS_ERROR_XPATH_BAD_ARGUMENT_COUNT:
return mozilla::Some("xpath-bad-argument-count"_ns);
case NS_ERROR_XPATH_BAD_EXTENSION_FUNCTION:
return mozilla::Some("xpath-bad-extension-function"_ns);
case NS_ERROR_XPATH_PAREN_EXPECTED:
return mozilla::Some("xpath-paren-expected"_ns);
case NS_ERROR_XPATH_INVALID_AXIS:
return mozilla::Some("xpath-invalid-axis"_ns);
case NS_ERROR_XPATH_NO_NODE_TYPE_TEST:
return mozilla::Some("xpath-no-node-type-test"_ns);
case NS_ERROR_XPATH_BRACKET_EXPECTED:
return mozilla::Some("xpath-bracket-expected"_ns);
case NS_ERROR_XPATH_INVALID_VAR_NAME:
return mozilla::Some("xpath-invalid-var-name"_ns);
case NS_ERROR_XPATH_UNEXPECTED_END:
return mozilla::Some("xpath-unexpected-end"_ns);
case NS_ERROR_XPATH_OPERATOR_EXPECTED:
return mozilla::Some("xpath-operator-expected"_ns);
case NS_ERROR_XPATH_UNCLOSED_LITERAL:
return mozilla::Some("xpath-unclosed-literal"_ns);
case NS_ERROR_XPATH_BAD_COLON:
return mozilla::Some("xpath-bad-colon"_ns);
case NS_ERROR_XPATH_BAD_BANG:
return mozilla::Some("xpath-bad-bang"_ns);
case NS_ERROR_XPATH_ILLEGAL_CHAR:
return mozilla::Some("xpath-illegal-char"_ns);
case NS_ERROR_XPATH_BINARY_EXPECTED:
return mozilla::Some("xpath-binary-expected"_ns);
case NS_ERROR_XSLT_LOAD_BLOCKED_ERROR:
return mozilla::Some("xslt-load-blocked-error"_ns);
case NS_ERROR_XPATH_INVALID_EXPRESSION_EVALUATED:
return mozilla::Some("xpath-invalid-expression-evaluated"_ns);
case NS_ERROR_XPATH_UNBALANCED_CURLY_BRACE:
return mozilla::Some("xpath-unbalanced-curly-brace"_ns);
case NS_ERROR_XSLT_BAD_NODE_NAME:
return mozilla::Some("xslt-bad-node-name"_ns);
case NS_ERROR_XSLT_VAR_ALREADY_SET:
return mozilla::Some("xslt-var-already-set"_ns);
case NS_ERROR_XSLT_CALL_TO_KEY_NOT_ALLOWED:
return mozilla::Some("xslt-call-to-key-not-allowed"_ns);
default:
return mozilla::Nothing();
}
}
void txMozillaXSLTProcessor::reportError(nsresult aResult,
const char16_t* aErrorText,
const char16_t* aSourceText) {
@@ -1069,38 +999,25 @@ void txMozillaXSLTProcessor::reportError(nsresult aResult,
if (aErrorText) {
mErrorText.Assign(aErrorText);
} else {
AutoTArray<nsCString, 1> resIds = {
"dom/xslt.ftl"_ns,
};
RefPtr<mozilla::intl::Localization> l10n =
mozilla::intl::Localization::Create(resIds, true);
if (l10n) {
nsAutoCString errorText;
auto statusId = StatusCodeToL10nId(aResult);
if (statusId) {
l10n->FormatValueSync(*statusId, {}, errorText, IgnoreErrors());
} else {
dom::Optional<intl::L10nArgs> l10nArgs;
l10nArgs.Construct();
auto errorArg = l10nArgs.Value().Entries().AppendElement();
errorArg->mKey = "errorCode";
errorArg->mValue.SetValue().SetAsUTF8String().AppendInt(
static_cast<uint32_t>(aResult), 16);
l10n->FormatValueSync("xslt-unknown-error"_ns, l10nArgs, errorText,
IgnoreErrors());
nsCOMPtr<nsIStringBundleService> sbs =
mozilla::components::StringBundle::Service();
if (sbs) {
nsString errorText;
sbs->FormatStatusMessage(aResult, u"", errorText);
nsAutoString errorMessage;
nsCOMPtr<nsIStringBundle> bundle;
sbs->CreateBundle(XSLT_MSGS_URL, getter_AddRefs(bundle));
if (bundle) {
AutoTArray<nsString, 1> error = {errorText};
if (mStylesheet) {
bundle->FormatStringFromName("TransformError", error, errorMessage);
} else {
bundle->FormatStringFromName("LoadingError", error, errorMessage);
}
}
dom::Optional<intl::L10nArgs> l10nArgs;
l10nArgs.Construct();
auto errorArg = l10nArgs.Value().Entries().AppendElement();
errorArg->mKey = "error";
errorArg->mValue.SetValue().SetAsUTF8String().Assign(errorText);
nsLiteralCString messageId =
mStylesheet ? "xslt-transform-error"_ns : "xslt-loading-error"_ns;
nsAutoCString errorMessage;
l10n->FormatValueSync(messageId, l10nArgs, errorMessage, IgnoreErrors());
mErrorText = NS_ConvertUTF8toUTF16(errorMessage);
mErrorText.Assign(errorMessage);
}
}

11
dom/xslt/xslt/txXSLTMsgsURL.h Normal file
View File

@@ -0,0 +1,11 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* 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/. */
#ifndef DOM_XSLT_XSLT_TXXSLTMSGSURL_H_
#define DOM_XSLT_XSLT_TXXSLTMSGSURL_H_
#define XSLT_MSGS_URL "chrome://global/locale/xslt/xslt.properties"
#endif // DOM_XSLT_XSLT_TXXSLTMSGSURL_H_

10
intl/strres/nsIStringBundle.idl
View File

@@ -78,6 +78,16 @@ interface nsIStringBundleService : nsISupports
{
nsIStringBundle createBundle(in string aURLSpec);
/**
* Formats a message string from a status code and status arguments.
* @param aStatus - The status code. This is mapped into a string ID and
* used in the string lookup process.
* @param aStatusArg - The status message argument(s). Multiple arguments
* can be separated by newline ('\n') characters.
* @return the formatted message
*/
AString formatStatusMessage(in nsresult aStatus, in wstring aStatusArg);
/**
* flushes the string bundle cache - useful when the locale changes or
* when we need to get some extra memory back

87
intl/strres/nsStringBundle.cpp
View File

@@ -25,6 +25,7 @@
#include "nsQueryObject.h"
#include "nsSimpleEnumerator.h"
#include "nsStringStream.h"
#include "mozilla/dom/txXSLTMsgsURL.h"
#include "mozilla/ipc/SharedMemoryHandle.h"
#include "mozilla/BinarySearch.h"
#include "mozilla/ClearOnShutdown.h"
@@ -844,9 +845,8 @@ void nsStringBundleService::RegisterContentBundle(
mSharedBundles.insertBack(cacheEntry);
}
NS_IMETHODIMP
nsStringBundleService::CreateBundle(const char* aURLSpec,
nsIStringBundle** aResult) {
void nsStringBundleService::getStringBundle(const char* aURLSpec,
nsIStringBundle** aResult) {
nsDependentCString key(aURLSpec);
bundleCacheEntry_t* cacheEntry = mBundleMap.Get(key);
@@ -898,8 +898,6 @@ nsStringBundleService::CreateBundle(const char* aURLSpec,
// finally, return the value
*aResult = cacheEntry->mBundle;
NS_ADDREF(*aResult);
return NS_OK;
}
UniquePtr<bundleCacheEntry_t> nsStringBundleService::evictOneEntry() {
@@ -933,3 +931,82 @@ bundleCacheEntry_t* nsStringBundleService::insertIntoCache(
return cacheEntry.release();
}
NS_IMETHODIMP
nsStringBundleService::CreateBundle(const char* aURLSpec,
nsIStringBundle** aResult) {
getStringBundle(aURLSpec, aResult);
return NS_OK;
}
#define GLOBAL_PROPERTIES "chrome://global/locale/global-strres.properties"
nsresult nsStringBundleService::FormatWithBundle(
nsIStringBundle* bundle, nsresult aStatus,
const nsTArray<nsString>& argArray, nsAString& result) {
nsresult rv;
// try looking up the error message with the int key:
uint16_t code = NS_ERROR_GET_CODE(aStatus);
rv = bundle->FormatStringFromID(code, argArray, result);
// If the int key fails, try looking up the default error message. E.g. print:
// An unknown error has occurred (0x804B0003).
if (NS_FAILED(rv)) {
AutoTArray<nsString, 1> otherArgArray;
otherArgArray.AppendElement()->AppendInt(static_cast<uint32_t>(aStatus),
16);
uint16_t code = NS_ERROR_GET_CODE(NS_ERROR_FAILURE);
rv = bundle->FormatStringFromID(code, otherArgArray, result);
}
return rv;
}
NS_IMETHODIMP
nsStringBundleService::FormatStatusMessage(nsresult aStatus,
const char16_t* aStatusArg,
nsAString& result) {
uint32_t i, argCount = 0;
nsCOMPtr<nsIStringBundle> bundle;
// XXX hack for mailnews who has already formatted their messages:
if (aStatus == NS_OK && aStatusArg) {
result.Assign(aStatusArg);
return NS_OK;
}
if (aStatus == NS_OK) {
return NS_ERROR_FAILURE; // no message to format
}
// format the arguments:
const nsDependentString args(aStatusArg);
argCount = args.CountChar(char16_t('\n')) + 1;
NS_ENSURE_ARG(argCount <= 10); // enforce 10-parameter limit
AutoTArray<nsString, 10> argArray;
// convert the aStatusArg into an nsString array
if (argCount == 1) {
argArray.AppendElement(aStatusArg);
} else if (argCount > 1) {
int32_t offset = 0;
for (i = 0; i < argCount; i++) {
int32_t pos = args.FindChar('\n', offset);
if (pos == -1) pos = args.Length();
argArray.AppendElement(Substring(args, offset, pos - offset));
offset = pos + 1;
}
}
switch (NS_ERROR_GET_MODULE(aStatus)) {
case NS_ERROR_MODULE_XSLT:
getStringBundle(XSLT_MSGS_URL, getter_AddRefs(bundle));
break;
default:
getStringBundle(GLOBAL_PROPERTIES, getter_AddRefs(bundle));
break;
}
return FormatWithBundle(bundle, aStatus, argArray, result);
}

5
intl/strres/nsStringBundleService.h
View File

@@ -47,6 +47,11 @@ class nsStringBundleService : public nsIStringBundleService,
private:
virtual ~nsStringBundleService();
void getStringBundle(const char* aUrl, nsIStringBundle** aResult);
nsresult FormatWithBundle(nsIStringBundle* bundle, nsresult aStatus,
const nsTArray<nsString>& argArray,
nsAString& result);
void flushBundleCache(bool ignoreShared = true);
mozilla::UniquePtr<bundleCacheEntry_t> evictOneEntry();

85
python/l10n/fluent_migrations/bug_1959147_xslt.py
View File

@@ -1,85 +0,0 @@
# Any copyright is dedicated to the Public Domain.
# http://creativecommons.org/publicdomain/zero/1.0/
import fluent.syntax.ast as FTL
from fluent.migrate.helpers import VARIABLE_REFERENCE
from fluent.migrate.transforms import COPY, REPLACE
def migrate(ctx):
"""Bug 1959147 - Migrate XSLT errors to Fluent, part {index}."""
xslt_source = "dom/chrome/xslt/xslt.properties"
global_strres_source = "dom/chrome/global-strres.properties"
target = "dom/dom/xslt.ftl"
xslt_errors = {
"xslt-parse-failure": "1",
"xpath-parse-failure": "2",
# 3 (NS_ERROR_XSLT_ALREADY_SET) is empty in xslt.properties.
# It seems it is always replaced with NS_ERROR_XSLT_VAR_ALREADY_SET.
"xslt-execution-failure": "4",
"xpath-unknown-function": "5",
"xslt-bad-recursion": "6",
"xslt-bad-value": "7",
"xslt-nodeset-expected": "8",
"xslt-aborted": "9",
"xslt-network-error": "10",
"xslt-wrong-mime-type": "11",
"xslt-load-recursion": "12",
"xpath-bad-argument-count": "13",
"xpath-bad-extension-function": "14",
"xpath-paren-expected": "15",
"xpath-invalid-axis": "16",
"xpath-no-node-type-test": "17",
"xpath-bracket-expected": "18",
"xpath-invalid-var-name": "19",
"xpath-unexpected-end": "20",
"xpath-operator-expected": "21",
"xpath-unclosed-literal": "22",
"xpath-bad-colon": "23",
"xpath-bad-bang": "24",
"xpath-illegal-char": "25",
"xpath-binary-expected": "26",
"xslt-load-blocked-error": "27",
"xpath-invalid-expression-evaluated": "28",
"xpath-unbalanced-curly-brace": "29",
"xslt-bad-node-name": "30",
"xslt-var-already-set": "31",
"xslt-call-to-key-not-allowed": "32",
}
ctx.add_transforms(
target,
target,
[
FTL.Message(id=FTL.Identifier(ftl_id), value=COPY(xslt_source, prop_id))
for ftl_id, prop_id in xslt_errors.items()
],
)
ctx.add_transforms(
target,
target,
[
FTL.Message(
id=FTL.Identifier("xslt-unknown-error"),
value=REPLACE(
global_strres_source,
"16389",
{"%1$S": VARIABLE_REFERENCE("errorCode")},
),
),
FTL.Message(
id=FTL.Identifier("xslt-loading-error"),
value=REPLACE(
xslt_source, "LoadingError", {"%1$S": VARIABLE_REFERENCE("error")}
),
),
FTL.Message(
id=FTL.Identifier("xslt-transform-error"),
value=REPLACE(
xslt_source, "TransformError", {"%1$S": VARIABLE_REFERENCE("error")}
),
),
],
)