From 2c12986a7fda4a580f6faccd0fd037ca65d5a826 Mon Sep 17 00:00:00 2001 From: shindli Date: Mon, 8 Jul 2019 23:09:34 +0300 Subject: [PATCH] Backed out 5 changesets (bug 1421938) for causing a bustage in /builds/worker/workspace/build/src/intl/locale/cldr-quotes.inc:21:448 CLOSED TREE Backed out changeset 3958f2af0e34 (bug 1421938) Backed out changeset 89a0866d1aa0 (bug 1421938) Backed out changeset f150702af11f (bug 1421938) Backed out changeset b8ebd4d241e0 (bug 1421938) Backed out changeset 1d38eb5eff6e (bug 1421938) --- .../shared/css/generated/properties-db.js | 1 - intl/locale/Quotes.cpp | 78 ------------- intl/locale/Quotes.h | 35 ------ intl/locale/cldr-quotes.inc | 45 -------- intl/locale/cldr-quotes.pl | 104 ------------------ intl/locale/moz.build | 2 - layout/base/nsQuoteList.cpp | 27 +---- layout/inspector/tests/test_bug877690.html | 2 +- layout/style/nsStyleStruct.cpp | 2 +- layout/style/test/property_database.js | 9 +- .../components/style/values/computed/list.rs | 20 +++- servo/components/style/values/computed/mod.rs | 2 +- .../components/style/values/specified/list.rs | 40 +------ .../components/style/values/specified/mod.rs | 2 +- servo/ports/geckolib/cbindgen.toml | 9 -- servo/ports/geckolib/glue.rs | 5 + .../tests/css/css-content/quotes-001.html | 15 --- .../tests/css/css-content/quotes-002.html | 16 --- .../tests/css/css-content/quotes-003.html | 16 --- .../tests/css/css-content/quotes-004.html | 16 --- .../tests/css/css-content/quotes-005.html | 16 --- .../tests/css/css-content/quotes-006.html | 16 --- .../tests/css/css-content/quotes-007.html | 16 --- .../tests/css/css-content/quotes-008.html | 16 --- .../tests/css/css-content/quotes-009.html | 16 --- .../tests/css/css-content/quotes-010.html | 16 --- .../tests/css/css-content/quotes-011.html | 16 --- .../tests/css/css-content/quotes-012.html | 16 --- .../tests/css/css-content/quotes-013.html | 16 --- .../tests/css/css-content/quotes-014.html | 16 --- .../tests/css/css-content/quotes-015.html | 16 --- .../tests/css/css-content/quotes-016.html | 16 --- .../tests/css/css-content/quotes-017.html | 16 --- .../tests/css/css-content/quotes-018.html | 16 --- .../tests/css/css-content/quotes-019.html | 16 --- .../tests/css/css-content/quotes-020.html | 16 --- .../tests/css/css-content/quotes-021.html | 16 --- .../tests/css/css-content/quotes-022.html | 16 --- .../tests/css/css-content/quotes-023.html | 16 --- .../tests/css/css-content/quotes-024.html | 16 --- .../tests/css/css-content/quotes-025.html | 16 --- .../tests/css/css-content/quotes-026.html | 16 --- .../tests/css/css-content/quotes-027.html | 16 --- .../tests/css/css-content/quotes-028.html | 15 --- .../tests/css/css-content/quotes-029.html | 16 --- .../tests/css/css-content/quotes-030.html | 15 --- .../tests/css/css-content/quotes-031.html | 15 --- .../tests/css/css-content/quotes-032.html | 15 --- .../tests/css/css-content/quotes-033.html | 16 --- .../css-content/reference/quotes-001-ref.html | 11 -- .../css-content/reference/quotes-002-ref.html | 11 -- .../css-content/reference/quotes-003-ref.html | 11 -- .../css-content/reference/quotes-004-ref.html | 12 -- .../css-content/reference/quotes-005-ref.html | 12 -- .../css-content/reference/quotes-006-ref.html | 12 -- .../css-content/reference/quotes-007-ref.html | 12 -- .../css-content/reference/quotes-008-ref.html | 12 -- .../css-content/reference/quotes-009-ref.html | 12 -- .../css-content/reference/quotes-010-ref.html | 12 -- .../css-content/reference/quotes-011-ref.html | 12 -- .../css-content/reference/quotes-012-ref.html | 12 -- .../css-content/reference/quotes-013-ref.html | 12 -- .../css-content/reference/quotes-014-ref.html | 12 -- .../css-content/reference/quotes-015-ref.html | 12 -- .../css-content/reference/quotes-016-ref.html | 12 -- .../css-content/reference/quotes-017-ref.html | 12 -- .../css-content/reference/quotes-018-ref.html | 12 -- .../css-content/reference/quotes-019-ref.html | 12 -- .../css-content/reference/quotes-020-ref.html | 12 -- .../css-content/reference/quotes-021-ref.html | 12 -- .../css-content/reference/quotes-022-ref.html | 12 -- .../css-content/reference/quotes-023-ref.html | 12 -- .../css-content/reference/quotes-024-ref.html | 12 -- .../css-content/reference/quotes-025-ref.html | 12 -- .../css-content/reference/quotes-026-ref.html | 12 -- .../css-content/reference/quotes-027-ref.html | 12 -- .../css-content/reference/quotes-028-ref.html | 12 -- .../css-content/reference/quotes-029-ref.html | 12 -- .../css-content/reference/quotes-030-ref.html | 12 -- .../css-content/reference/quotes-031-ref.html | 12 -- .../css-content/reference/quotes-032-ref.html | 12 -- .../css-content/reference/quotes-033-ref.html | 12 -- xpcom/ds/nsAtom.h | 2 +- 83 files changed, 38 insertions(+), 1263 deletions(-) delete mode 100644 intl/locale/Quotes.cpp delete mode 100644 intl/locale/Quotes.h delete mode 100644 intl/locale/cldr-quotes.inc delete mode 100644 intl/locale/cldr-quotes.pl delete mode 100644 testing/web-platform/tests/css/css-content/quotes-001.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-002.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-003.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-004.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-005.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-006.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-007.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-008.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-009.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-010.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-011.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-012.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-013.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-014.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-015.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-016.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-017.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-018.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-019.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-020.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-021.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-022.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-023.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-024.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-025.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-026.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-027.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-028.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-029.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-030.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-031.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-032.html delete mode 100644 testing/web-platform/tests/css/css-content/quotes-033.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-001-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-002-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-003-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-004-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-005-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-006-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-007-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-008-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-009-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-010-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-011-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-012-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-013-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-014-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-015-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-016-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-017-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-018-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-019-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-020-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-021-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-022-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-023-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-024-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-025-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-026-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-027-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-028-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-029-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-030-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-031-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-032-ref.html delete mode 100644 testing/web-platform/tests/css/css-content/reference/quotes-033-ref.html diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js index e119f457fe38..d43d1fc15c5c 100644 --- a/devtools/shared/css/generated/properties-db.js +++ b/devtools/shared/css/generated/properties-db.js @@ -9020,7 +9020,6 @@ exports.CSS_PROPERTIES = { ], "supports": [], "values": [ - "auto", "inherit", "initial", "none", diff --git a/intl/locale/Quotes.cpp b/intl/locale/Quotes.cpp deleted file mode 100644 index 9379f18a14ec..000000000000 --- a/intl/locale/Quotes.cpp +++ /dev/null @@ -1,78 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; 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/. */ - -#include "Quotes.h" -#include "MozLocale.h" -#include "mozilla/ClearOnShutdown.h" -#include "mozilla/StaticPtr.h" -#include "nsDataHashtable.h" -#include "nsPrintfCString.h" - -using namespace mozilla; -using namespace mozilla::intl; - -namespace { -struct LangQuotesRec { - const char* mLangs; - Quotes mQuotes; -}; - -#include "cldr-quotes.inc" - -static StaticAutoPtr> sQuotesForLang; -} // anonymous namespace - -namespace mozilla { -namespace intl { - -const Quotes* QuotesForLang(const nsAtom* aLang) { - MOZ_ASSERT(NS_IsMainThread()); - - // On first use, initialize the hashtable from our CLDR-derived data array. - if (!sQuotesForLang) { - sQuotesForLang = new nsDataHashtable(32); - ClearOnShutdown(&sQuotesForLang); - for (const auto& i : sLangQuotes) { - const char* s = i.mLangs; - size_t len; - while ((len = strlen(s))) { - sQuotesForLang->Put(nsDependentCString(s, len), i.mQuotes); - s += len + 1; - } - } - } - - nsAtomCString langStr(aLang); - const Quotes* entry = sQuotesForLang->GetValue(langStr); - if (entry) { - // Found an exact match for the requested lang. - return entry; - } - - // Try parsing lang as a Locale (which will also canonicalize case of the - // subtags), then see if we can match it with region or script subtags, - // if present, or just the primary language tag. - Locale loc(langStr); - if (loc.IsWellFormed()) { - if (!loc.GetRegion().IsEmpty() && - (entry = sQuotesForLang->GetValue(nsPrintfCString( - "%s-%s", loc.GetLanguage().get(), loc.GetRegion().get())))) { - return entry; - } - if (!loc.GetScript().IsEmpty() && - (entry = sQuotesForLang->GetValue(nsPrintfCString( - "%s-%s", loc.GetLanguage().get(), loc.GetScript().get())))) { - return entry; - } - if ((entry = sQuotesForLang->GetValue(loc.GetLanguage()))) { - return entry; - } - } - - return nullptr; -} - -} // namespace intl -} // namespace mozilla diff --git a/intl/locale/Quotes.h b/intl/locale/Quotes.h deleted file mode 100644 index 7bd7d277ca27..000000000000 --- a/intl/locale/Quotes.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; 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 mozilla_intl_Quotes_h__ -#define mozilla_intl_Quotes_h__ - -#include "nsAtom.h" - -namespace mozilla { -namespace intl { - -// Currently, all the quotation characters provided by CLDR are single BMP -// codepoints, so they fit into char16_t fields. If there are ever multi- -// character strings or non-BMP codepoints in a future version, we'll need -// to extend this to a larger/more flexible structure, but for now it's -// deliberately kept simple and lightweight. -struct Quotes { - // Entries in order [open, close, alternativeOpen, alternativeClose] - char16_t mChars[4]; -}; - -/** - * Return a pointer to the Quotes record for the given locale (lang attribute), - * or nullptr if none available. - * The returned value points to a hashtable entry, but will remain valid until - * shutdown begins, as the table is not modified after initialization. - */ -const Quotes* QuotesForLang(const nsAtom* aLang); - -} // namespace intl -} // namespace mozilla - -#endif // mozilla_intl_Quotes_h__ diff --git a/intl/locale/cldr-quotes.inc b/intl/locale/cldr-quotes.inc deleted file mode 100644 index 7475baf5d5e6..000000000000 --- a/intl/locale/cldr-quotes.inc +++ /dev/null @@ -1,45 +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/. */ - -/* - * Derived from the Unicode Common Locale Data Repository by cldr-quotes.pl. - * - * For terms of use, see http://www.unicode.org/copyright.html. - */ - -/* - * Created on Fri Jul 5 20:02:29 2019 from CLDR data file cldr-common-35.1.zip. - * - * * * * * This file contains MACHINE-GENERATED DATA, do not edit! * * * * * - * - * (generated by intl/locale/cldr-quotes.pl) - */ - -static const LangQuotesRec sLangQuotes[] = { - // clang-format off - { "af\0ak\0as\0asa\0az\0bem\0bez\0bn\0brx\0ccp\0ceb\0cgg\0chr\0cy\0da\0dav\0dje\0dz\0ebu\0ee\0en\0fil\0fo\0ga\0gd\0gl\0gu\0guz\0ha\0id\0ig\0jmc\0jv\0kam\0kde\0kea\0khq\0ki\0kln\0km\0kn\0kok\0ksb\0ku\0lg\0ln\0lo\0lrc\0lu\0luo\0lv\0mas\0mer\0mfe\0mgo\0mi\0ml\0mn\0mr\0ms\0mt\0my\0naq\0nd\0ne\0nus\0nyn\0or\0ps\0rof\0rwk\0saq\0sbp\0sd\0seh\0ses\0si\0so\0sw\0te\0teo\0th\0to\0tr\0tt\0twq\0tzm\0uz-Cyrl\0vai\0vun\0wo\0xog\0yo\0yue-Hans\0zh\0zu\0", { 0x201c, 0x201d, 0x2018, 0x2019 } }, - { "agq\0ff\0", { 0x201e, 0x201d, 0x201a, 0x2019 } }, - { "am\0az-Cyrl\0fa\0fr-CH\0gsw\0jgo\0kkj\0mzn\0", { 0xab, 0xbb, 0x2039, 0x203a } }, - { "ar\0ur\0", { 0x201d, 0x201c, 0x2019, 0x2018 } }, - { "ast\0bm\0ca\0dyo\0el\0es\0ewo\0it\0kab\0kk\0mg\0mua\0nnh\0pt-PT\0sg\0sq\0", { 0xab, 0xbb, 0x201c, 0x201d } }, - { "bas\0be\0ky\0ru\0sah\0uk\0", { 0xab, 0xbb, 0x201e, 0x201c } }, - { "bg\0lt\0", { 0x201e, 0x201c, 0x201e, 0x201c } }, - { "br\0", { 0x201c, 0x201d, 0xab, 0xbb } }, - { "bs-Cyrl\0cs\0de\0dsb\0et\0hr\0hsb\0is\0lb\0luy\0mk\0sk\0sl\0", { 0x201e, 0x201c, 0x201a, 0x2018 } }, - { "bs\0", { 0x201e, 0x201d, 0x2018, 0x2019 } }, - { "dua\0ksf\0nb\0nn\0rw\0", { 0xab, 0xbb, 0x2018, 0x2019 } }, - { "es-419\0eu\0tk\0", { 0x201c, 0x201d, 0x201c, 0x201d } }, - { "fi\0he\0lag\0rn\0sn\0sv\0", { 0x201d, 0x201d, 0x2019, 0x2019 } }, - { "fr-CA\0", { 0xab, 0xbb, 0x201d, 0x201c } }, - { "fr\0hy\0tg\0yav\0", { 0xab, 0xbb, 0xab, 0xbb } }, - { "hu\0", { 0x201e, 0x201d, 0xbb, 0xab } }, - { "ia\0nl\0ti-ER\0xh\0", { 0x2018, 0x2019, 0x201c, 0x201d } }, - { "ja\0yue\0zh-Hant\0", { 0x300c, 0x300d, 0x300e, 0x300f } }, - { "ka\0", { 0x201e, 0x201c, 0xab, 0xbb } }, - { "nmg\0pl\0ro\0", { 0x201e, 0x201d, 0xab, 0xbb } }, - { "shi\0zgh\0", { 0xab, 0xbb, 0x201e, 0x201d } }, - { "sr\0", { 0x201e, 0x201c, 0x2018, 0x2018 } }, - { "uz\0", { 0x201c, 0x201d, 0x2019, 0x2018 } }, - // clang-format on -}; diff --git a/intl/locale/cldr-quotes.pl b/intl/locale/cldr-quotes.pl deleted file mode 100644 index e7a2e7593fb9..000000000000 --- a/intl/locale/cldr-quotes.pl +++ /dev/null @@ -1,104 +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/. - -# Tool to generate the cldr-quotes.inc file, to be #include'd in Quotes.cpp -# to provide locale-appropriate opening and closing quote marks. - -# To regenerate cldr-quotes.inc for a new CLDR release, download the data file -# "cldr-common-##.zip" from http://unicode.org/Public/cldr/latest into the -# current directory, update the $filename variable below accordingly, run -# -# perl cldr-quotes.pl > cldr-quotes.inc -# -# then use `hg diff` to check that the result looks sane. - -use warnings; -use strict; - -use Encode; -use IO::Uncompress::Unzip; - -my $filename = 'cldr-common-35.1.zip'; - -my (%langQuotes, %quoteLangs); - -my $zip = IO::Uncompress::Unzip->new($filename) || - die "unzip failed: $IO::Uncompress::Unzip::UnzipError\n"; -my $status = 1; -while ($status > 0) { - my $name = $zip->getHeaderInfo()->{Name}; - if ($name =~ m@common/main/([A-Za-z0-9_]+)\.xml@) { - my $lang = $1; - $lang =~ s/_/-/; - while (<$zip>) { - $langQuotes{$lang}[0] = $1 if (m!(.+)(.+)(.+)(.+)nextStream(); -} -$zip->close; - -foreach my $lang (sort keys %langQuotes) { - # We don't actually want to emit anything for the root locale - next if $lang eq "root"; - - # Inherit any missing entries from the locale's parent - my $parent = $lang; - while ($parent =~ m/\-/) { - # Strip off a trailing subtag to find a parent locale code - $parent =~ s/\-[^-]+$//; - # Fill in any values available from the parent - for (my $i = 0; $i < 4; $i++) { - $langQuotes{$lang}[$i] = $langQuotes{$parent}[$i] unless $langQuotes{$lang}[$i]; - } - } - - # Anything still missing is copied from the root locale - for (my $i = 0; $i < 4; $i++) { - $langQuotes{$lang}[$i] = $langQuotes{"root"}[$i] unless $langQuotes{$lang}[$i]; - } - - # If the locale ends up the same as its parent, skip - next if ($parent ne $lang) && (exists $langQuotes{$parent}) && - (join(",", @{$langQuotes{$lang}}) eq join(",", @{$langQuotes{$parent}})); - - # Create a string with the C source form for the array of 4 quote characters - my $quoteChars = join(", ", map { sprintf("0x%x", ord Encode::decode("UTF-8", $_)) } @{$langQuotes{$lang}}); - - # Record this locale in the list of those which use this particular set of quotes - $quoteLangs{$quoteChars} = [] unless exists $quoteLangs{$quoteChars}; - push $quoteLangs{$quoteChars}, $lang; -} - -# Output each unique list of quotes, with the string of associated locales -my $timestamp = gmtime(); -print <<__EOT__; -/* 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/. */ - -/* - * Derived from the Unicode Common Locale Data Repository by cldr-quotes.pl. - * - * For terms of use, see http://www.unicode.org/copyright.html. - */ - -/* - * Created on $timestamp from CLDR data file $filename. - * - * * * * * This file contains MACHINE-GENERATED DATA, do not edit! * * * * * - * - * (generated by intl/locale/cldr-quotes.pl) - */ - -__EOT__ - -print "static const LangQuotesRec sLangQuotes[] = {\n"; -print " // clang-format off\n"; -print sort map { sprintf(" { \"%s\\0\", { %s } },\n", join("\\0", sort @{$quoteLangs{$_}}), $_) } (keys %quoteLangs); -print " // clang-format on\n"; -print "};\n"; diff --git a/intl/locale/moz.build b/intl/locale/moz.build index 8587ed4bfe0c..fe97934a33af 100644 --- a/intl/locale/moz.build +++ b/intl/locale/moz.build @@ -36,7 +36,6 @@ EXPORTS.mozilla.intl += [ 'LocaleService.h', 'MozLocale.h', 'OSPreferences.h', - 'Quotes.h', ] UNIFIED_SOURCES += [ @@ -48,7 +47,6 @@ UNIFIED_SOURCES += [ 'nsLanguageAtomService.cpp', 'nsUConvPropertySearch.cpp', 'OSPreferences.cpp', - 'Quotes.cpp', ] EXTRA_JS_MODULES += [ diff --git a/layout/base/nsQuoteList.cpp b/layout/base/nsQuoteList.cpp index e8d227ebbee5..1839c56d2c93 100644 --- a/layout/base/nsQuoteList.cpp +++ b/layout/base/nsQuoteList.cpp @@ -11,7 +11,6 @@ #include "nsIContent.h" #include "mozilla/ErrorResult.h" #include "mozilla/dom/Text.h" -#include "mozilla/intl/Quotes.h" using namespace mozilla; @@ -42,30 +41,8 @@ nsString nsQuoteNode::Text() { int32_t depth = Depth(); MOZ_ASSERT(depth >= -1); - if (depth < 0) { - return result; - } - - const auto& quotesProp = mPseudoFrame->StyleList()->mQuotes; - - if (quotesProp.IsAuto()) { - // Look up CLDR-derived quotation marks for current language; - // if none available, use built-in default. - const intl::Quotes* quotes = - intl::QuotesForLang(mPseudoFrame->StyleFont()->mLanguage); - if (!quotes) { - static const intl::Quotes sDefaultQuotes = {0x201c, 0x201d, 0x2018, - 0x2019}; - quotes = &sDefaultQuotes; - } - size_t index = (depth == 0 ? 0 : 2); // select first or second pair - index += (mType == StyleContentType::OpenQuote ? 0 : 1); // open or close - result.Append(quotes->mChars[index]); - return result; - } - - MOZ_ASSERT(quotesProp.IsQuoteList()); - const Span quotes = quotesProp.AsQuoteList().AsSpan(); + Span quotes = + mPseudoFrame->StyleList()->mQuotes._0.AsSpan(); // Reuse the last pair when the depth is greater than the number of // pairs of quotes. (Also make 'quotes: none' and close-quote from diff --git a/layout/inspector/tests/test_bug877690.html b/layout/inspector/tests/test_bug877690.html index ce41a51b04ba..74ca9729b716 100644 --- a/layout/inspector/tests/test_bug877690.html +++ b/layout/inspector/tests/test_bug877690.html @@ -156,7 +156,7 @@ function do_test() { var prop = "quotes" var values = InspectorUtils.getCSSValuesForProperty(prop); - var expected = [ "inherit", "initial", "unset", "revert", "auto", "none" ]; + var expected = [ "inherit", "initial", "unset", "none", "revert" ]; ok(testValues(values, expected), "property quotes's values."); // Regression test for bug 1255384. diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp index 9c7efbc4ceb4..9ee7df0b3a39 100644 --- a/layout/style/nsStyleStruct.cpp +++ b/layout/style/nsStyleStruct.cpp @@ -542,7 +542,7 @@ nsChangeHint nsStyleOutline::CalcDifference( // nsStyleList::nsStyleList(const Document& aDocument) : mListStylePosition(NS_STYLE_LIST_STYLE_POSITION_OUTSIDE), - mQuotes(StyleQuotes::Auto()), + mQuotes{StyleArcSlice(Servo_Quotes_GetInitialValue())}, mMozListReversed(StyleMozListReversed::False) { MOZ_COUNT_CTOR(nsStyleList); MOZ_ASSERT(NS_IsMainThread()); diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js index eee4cbce3944..89c6720efa86 100644 --- a/layout/style/test/property_database.js +++ b/layout/style/test/property_database.js @@ -7116,15 +7116,12 @@ var gCSSProperties = { domProp: "quotes", inherited: true, type: CSS_TYPE_LONGHAND, - initial_values: ["auto"], - other_values: [ - "none", - "'\"' '\"'", - "'' ''", + initial_values: [ '"\u201C" "\u201D" "\u2018" "\u2019"', '"\\201C" "\\201D" "\\2018" "\\2019"', ], - invalid_values: ["'\"'", '"" "" ""'], + other_values: ["none", "'\"' '\"'"], + invalid_values: [], }, right: { domProp: "right", diff --git a/servo/components/style/values/computed/list.rs b/servo/components/style/values/computed/list.rs index 2ae3776041b6..bdcf62ba2f82 100644 --- a/servo/components/style/values/computed/list.rs +++ b/servo/components/style/values/computed/list.rs @@ -7,12 +7,28 @@ #[cfg(feature = "gecko")] pub use crate::values::specified::list::ListStyleType; pub use crate::values::specified::list::MozListReversed; -pub use crate::values::specified::list::Quotes; +pub use crate::values::specified::list::{QuotePair, Quotes}; + +lazy_static! { + static ref INITIAL_QUOTES: crate::ArcSlice = crate::ArcSlice::from_iter_leaked( + vec![ + QuotePair { + opening: "\u{201c}".to_owned().into(), + closing: "\u{201d}".to_owned().into(), + }, + QuotePair { + opening: "\u{2018}".to_owned().into(), + closing: "\u{2019}".to_owned().into(), + }, + ] + .into_iter() + ); +} impl Quotes { /// Initial value for `quotes`. #[inline] pub fn get_initial_value() -> Quotes { - Quotes::Auto + Quotes(INITIAL_QUOTES.clone()) } } diff --git a/servo/components/style/values/computed/mod.rs b/servo/components/style/values/computed/mod.rs index aa37189f0516..cea768abeff9 100644 --- a/servo/components/style/values/computed/mod.rs +++ b/servo/components/style/values/computed/mod.rs @@ -64,7 +64,7 @@ pub use self::length::{NonNegativeLengthPercentage, NonNegativeLengthPercentageO #[cfg(feature = "gecko")] pub use self::list::ListStyleType; pub use self::list::MozListReversed; -pub use self::list::Quotes; +pub use self::list::{QuotePair, Quotes}; pub use self::motion::{OffsetPath, OffsetRotate}; pub use self::outline::OutlineStyle; pub use self::percentage::{NonNegativePercentage, Percentage}; diff --git a/servo/components/style/values/specified/list.rs b/servo/components/style/values/specified/list.rs index f5bda33ce73b..0519053b902f 100644 --- a/servo/components/style/values/specified/list.rs +++ b/servo/components/style/values/specified/list.rs @@ -104,7 +104,7 @@ pub struct QuotePair { pub closing: crate::OwnedStr, } -/// List of quote pairs for the specified/computed value of `quotes` property. +/// Specified and computed `quotes` property. #[derive( Clone, Debug, @@ -117,53 +117,23 @@ pub struct QuotePair { ToResolvedValue, ToShmem, )] -#[repr(transparent)] -pub struct QuoteList( +#[repr(C)] +pub struct Quotes( #[css(iterable, if_empty = "none")] #[ignore_malloc_size_of = "Arc"] pub crate::ArcSlice, ); -/// Specified and computed `quotes` property: `auto`, `none`, or a list -/// of characters. -/// -/// cbindgen:derive-tagged-enum-copy-constructor=true -#[derive( - Clone, - Debug, - MallocSizeOf, - PartialEq, - SpecifiedValueInfo, - ToComputedValue, - ToCss, - ToResolvedValue, - ToShmem, -)] -#[repr(C)] -pub enum Quotes { - /// list of quote pairs - QuoteList(QuoteList), - /// auto (use lang-dependent quote marks) - Auto, -} - impl Parse for Quotes { fn parse<'i, 't>( _: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if input - .try(|input| input.expect_ident_matching("auto")) - .is_ok() - { - return Ok(Quotes::Auto); - } - if input .try(|input| input.expect_ident_matching("none")) .is_ok() { - return Ok(Quotes::QuoteList(QuoteList::default())) + return Ok(Self::default()); } let mut quotes = Vec::new(); @@ -180,7 +150,7 @@ impl Parse for Quotes { } if !quotes.is_empty() { - Ok(Quotes::QuoteList(QuoteList(crate::ArcSlice::from_iter(quotes.into_iter())))) + Ok(Quotes(crate::ArcSlice::from_iter(quotes.into_iter()))) } else { Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError)) } diff --git a/servo/components/style/values/specified/mod.rs b/servo/components/style/values/specified/mod.rs index b22292a9dced..14439d2eea07 100644 --- a/servo/components/style/values/specified/mod.rs +++ b/servo/components/style/values/specified/mod.rs @@ -65,7 +65,7 @@ pub use self::length::{NonNegativeLengthPercentage, NonNegativeLengthPercentageO #[cfg(feature = "gecko")] pub use self::list::ListStyleType; pub use self::list::MozListReversed; -pub use self::list::Quotes; +pub use self::list::{QuotePair, Quotes}; pub use self::motion::{OffsetPath, OffsetRotate}; pub use self::outline::OutlineStyle; pub use self::percentage::Percentage; diff --git a/servo/ports/geckolib/cbindgen.toml b/servo/ports/geckolib/cbindgen.toml index 64f71c7db2ec..f60cd3703df5 100644 --- a/servo/ports/geckolib/cbindgen.toml +++ b/servo/ports/geckolib/cbindgen.toml @@ -320,15 +320,6 @@ renaming_overrides_prefixing = true inline bool IsNone() const; """ -"Quotes" = """ - private: - // Private default constructor without initialization so that the helper - // constructor functions still work as expected. They take care of - // initializing the fields properly. - StyleQuotes() {} - public: -""" - # TODO(emilio): Add hooks to cbindgen to be able to generate MOZ_MUST_USE_TYPE # or MOZ_MUST_USE on the functions. "Owned" = """ diff --git a/servo/ports/geckolib/glue.rs b/servo/ports/geckolib/glue.rs index ec39a355d7b1..dad9700fabd4 100644 --- a/servo/ports/geckolib/glue.rs +++ b/servo/ports/geckolib/glue.rs @@ -6606,6 +6606,11 @@ pub unsafe extern "C" fn Servo_IsCssPropertyRecordedInUseCounter( use_counters.non_custom_properties.recorded(non_custom_id) } +#[no_mangle] +pub extern "C" fn Servo_Quotes_GetInitialValue() -> style_traits::arc_slice::ForgottenArcSlicePtr { + computed::Quotes::get_initial_value().0.forget() +} + #[no_mangle] pub unsafe extern "C" fn Servo_SharedMemoryBuilder_Create( buffer: *mut u8, diff --git a/testing/web-platform/tests/css/css-content/quotes-001.html b/testing/web-platform/tests/css/css-content/quotes-001.html deleted file mode 100644 index 26fddec97a96..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-001.html +++ /dev/null @@ -1,15 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the outer quote marks are double, -and the two sets of inner ones are single. diff --git a/testing/web-platform/tests/css/css-content/quotes-002.html b/testing/web-platform/tests/css/css-content/quotes-002.html deleted file mode 100644 index e87938cf9812..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-002.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -Test passes if the word quotes is enclosed in curly quotes, -and angle brackets in angle brackets. diff --git a/testing/web-platform/tests/css/css-content/quotes-003.html b/testing/web-platform/tests/css/css-content/quotes-003.html deleted file mode 100644 index ed568f2d0455..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-003.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the outer quote marks are angle brackets, -and the two sets of inner ones are square brackets. diff --git a/testing/web-platform/tests/css/css-content/quotes-004.html b/testing/web-platform/tests/css/css-content/quotes-004.html deleted file mode 100644 index 0fbe91d1946d..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-004.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

አንድ ሁለት ሦስት -

«አንድ ‹ሁለት› ሦስት» diff --git a/testing/web-platform/tests/css/css-content/quotes-005.html b/testing/web-platform/tests/css/css-content/quotes-005.html deleted file mode 100644 index d813a589de04..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-005.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

واحد اثنينل ثلاثة -

”واحد ’اثنينل‘ ثلاثة“ diff --git a/testing/web-platform/tests/css/css-content/quotes-006.html b/testing/web-platform/tests/css/css-content/quotes-006.html deleted file mode 100644 index b4f876f44608..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-006.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

এক দুই তিন -

“এক ‘দুই’ তিন” diff --git a/testing/web-platform/tests/css/css-content/quotes-007.html b/testing/web-platform/tests/css/css-content/quotes-007.html deleted file mode 100644 index b6791d42a522..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-007.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

Ꮒꭶꮣ ꭰꮒᏼꮻ ꭴꮎꮥꮕꭲ -

“Ꮒꭶꮣ ‘ꭰꮒᏼꮻ’ ꭴꮎꮥꮕꭲ” diff --git a/testing/web-platform/tests/css/css-content/quotes-008.html b/testing/web-platform/tests/css/css-content/quotes-008.html deleted file mode 100644 index 5369fd0bbfe8..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-008.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

ένα δύο τρία -

«ένα “δύο” τρία» diff --git a/testing/web-platform/tests/css/css-content/quotes-009.html b/testing/web-platform/tests/css/css-content/quotes-009.html deleted file mode 100644 index ae1688f5a4eb..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-009.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

یک دو سه -

«یک ‹دو› سه» diff --git a/testing/web-platform/tests/css/css-content/quotes-010.html b/testing/web-platform/tests/css/css-content/quotes-010.html deleted file mode 100644 index 022bdd561b45..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-010.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

un deux trois -

«un «deux» trois» diff --git a/testing/web-platform/tests/css/css-content/quotes-011.html b/testing/web-platform/tests/css/css-content/quotes-011.html deleted file mode 100644 index 3a3dc87d1680..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-011.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

un deux trois -

«un ‹deux› trois» diff --git a/testing/web-platform/tests/css/css-content/quotes-012.html b/testing/web-platform/tests/css/css-content/quotes-012.html deleted file mode 100644 index 481b73dc7745..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-012.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

એક બે રણ -

“એક ‘બે’ રણ” diff --git a/testing/web-platform/tests/css/css-content/quotes-013.html b/testing/web-platform/tests/css/css-content/quotes-013.html deleted file mode 100644 index 9db9526a8c61..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-013.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

אחת שתיים שלוש -

”אחת ’שתיים’ שלוש” diff --git a/testing/web-platform/tests/css/css-content/quotes-014.html b/testing/web-platform/tests/css/css-content/quotes-014.html deleted file mode 100644 index 967510a6538a..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-014.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

एक दो तीन -

“एक ‘दो’ तीन” diff --git a/testing/web-platform/tests/css/css-content/quotes-015.html b/testing/web-platform/tests/css/css-content/quotes-015.html deleted file mode 100644 index 86a96085f216..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-015.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

egy kettő három -

„egy »kettő« három” diff --git a/testing/web-platform/tests/css/css-content/quotes-016.html b/testing/web-platform/tests/css/css-content/quotes-016.html deleted file mode 100644 index ebb812024403..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-016.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

一 二 三 -

「一 『二』 三」 diff --git a/testing/web-platform/tests/css/css-content/quotes-017.html b/testing/web-platform/tests/css/css-content/quotes-017.html deleted file mode 100644 index f03ec2136338..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-017.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

មួយ ពីរ បី -

“មួយ ‘ពីរ’ បី” diff --git a/testing/web-platform/tests/css/css-content/quotes-018.html b/testing/web-platform/tests/css/css-content/quotes-018.html deleted file mode 100644 index 48bd318398d8..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-018.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

하나 둘 셋 -

“하나 ‘둘’ 셋” diff --git a/testing/web-platform/tests/css/css-content/quotes-019.html b/testing/web-platform/tests/css/css-content/quotes-019.html deleted file mode 100644 index 5bd522ee1abb..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-019.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

ຫນຶ່ງ ສອງ ສາມ -

“ຫນຶ່ງ ‘ສອງ’ ສາມ” diff --git a/testing/web-platform/tests/css/css-content/quotes-020.html b/testing/web-platform/tests/css/css-content/quotes-020.html deleted file mode 100644 index 0c1827d807c5..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-020.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

တစ် နှစ် သုံး -

“တစ် ‘နှစ်’ သုံး” diff --git a/testing/web-platform/tests/css/css-content/quotes-021.html b/testing/web-platform/tests/css/css-content/quotes-021.html deleted file mode 100644 index 518ba53bef47..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-021.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

een twee drie -

‘een “twee” drie’ diff --git a/testing/web-platform/tests/css/css-content/quotes-022.html b/testing/web-platform/tests/css/css-content/quotes-022.html deleted file mode 100644 index 430b98b2c802..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-022.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

ਇੱਕ ਦੋ ਤਿੰਨ -

“ਇੱਕ ‘ਦੋ’ ਤਿੰਨ” diff --git a/testing/web-platform/tests/css/css-content/quotes-023.html b/testing/web-platform/tests/css/css-content/quotes-023.html deleted file mode 100644 index e88d6abffcd1..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-023.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

ஒன்று இரண்டு மூன்று -

“ஒன்று ‘இரண்டு’ மூன்று” diff --git a/testing/web-platform/tests/css/css-content/quotes-024.html b/testing/web-platform/tests/css/css-content/quotes-024.html deleted file mode 100644 index 99b29a2d67ad..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-024.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

หนึ่งสองสาม -

“หนึ่ง‘สอง’สาม” diff --git a/testing/web-platform/tests/css/css-content/quotes-025.html b/testing/web-platform/tests/css/css-content/quotes-025.html deleted file mode 100644 index 28e1f2904bf5..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-025.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

一 二 三 -

“一 ‘二’ 三” diff --git a/testing/web-platform/tests/css/css-content/quotes-026.html b/testing/web-platform/tests/css/css-content/quotes-026.html deleted file mode 100644 index ee1d5c56649a..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-026.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

一 二 三 -

「一 『二』 三」 diff --git a/testing/web-platform/tests/css/css-content/quotes-027.html b/testing/web-platform/tests/css/css-content/quotes-027.html deleted file mode 100644 index 051d30853956..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-027.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - - -

Test passes if the quote marks in both lines match: -

一 二 三 -

“一 ‘二’ 三” diff --git a/testing/web-platform/tests/css/css-content/quotes-028.html b/testing/web-platform/tests/css/css-content/quotes-028.html deleted file mode 100644 index 5ec2ad0f02c8..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-028.html +++ /dev/null @@ -1,15 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - -

Test passes if the quote marks in both lines match: -

One two three four five six -

One “two ‘three «four ‹five ‹six››»’” diff --git a/testing/web-platform/tests/css/css-content/quotes-029.html b/testing/web-platform/tests/css/css-content/quotes-029.html deleted file mode 100644 index 760605d0e203..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-029.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - -

Test passes if the quote marks in both lines match: -

One two three four five six -

One two three «four ‹five ‹six››» diff --git a/testing/web-platform/tests/css/css-content/quotes-030.html b/testing/web-platform/tests/css/css-content/quotes-030.html deleted file mode 100644 index eb3f4a4b2d85..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-030.html +++ /dev/null @@ -1,15 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - -

Test passes if the quote marks in both lines match: -

One two three four -

One “two 『three «four»』” diff --git a/testing/web-platform/tests/css/css-content/quotes-031.html b/testing/web-platform/tests/css/css-content/quotes-031.html deleted file mode 100644 index 72d2027341df..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-031.html +++ /dev/null @@ -1,15 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - -

Test passes if the quote marks in both lines match: -

One two three four -

One ‹two ‹three ‹four››› diff --git a/testing/web-platform/tests/css/css-content/quotes-032.html b/testing/web-platform/tests/css/css-content/quotes-032.html deleted file mode 100644 index cb0b36312be5..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-032.html +++ /dev/null @@ -1,15 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - -

Test passes if both lines match, with no quote marks: -

One two three four -

One two three four diff --git a/testing/web-platform/tests/css/css-content/quotes-033.html b/testing/web-platform/tests/css/css-content/quotes-033.html deleted file mode 100644 index ca5447886473..000000000000 --- a/testing/web-platform/tests/css/css-content/quotes-033.html +++ /dev/null @@ -1,16 +0,0 @@ - - - -CSS Generated Content test: quotes - - - - - - -

Test passes if quote marks in both lines match: -

One two three four five -

One two “three ‘four’” five diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-001-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-001-ref.html deleted file mode 100644 index 8e26721e0359..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-001-ref.html +++ /dev/null @@ -1,11 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the “outer ‘quote marks’ are double, -and the two sets of ‘inner’ ones” are single. diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-002-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-002-ref.html deleted file mode 100644 index aa0b2c8a42f2..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-002-ref.html +++ /dev/null @@ -1,11 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -Test passes if the word “quotes” is enclosed in curly quotes, -and <angle brackets> in angle brackets. diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-003-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-003-ref.html deleted file mode 100644 index b078c0bf307e..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-003-ref.html +++ /dev/null @@ -1,11 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the <outer [quote marks] are angle brackets, -and the two sets of [inner] ones> are square brackets. diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-004-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-004-ref.html deleted file mode 100644 index 668c65afa181..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-004-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

«አንድ ‹ሁለት› ሦስት» -

«አንድ ‹ሁለት› ሦስት» diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-005-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-005-ref.html deleted file mode 100644 index fe3161fec3c1..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-005-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

”واحد ’اثنينل‘ ثلاثة“ -

”واحد ’اثنينل‘ ثلاثة“ diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-006-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-006-ref.html deleted file mode 100644 index fcbc028490f6..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-006-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

“এক ‘দুই’ তিন” -

“এক ‘দুই’ তিন” diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-007-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-007-ref.html deleted file mode 100644 index 5e0416f2c52f..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-007-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

“Ꮒꭶꮣ ‘ꭰꮒᏼꮻ’ ꭴꮎꮥꮕꭲ” -

“Ꮒꭶꮣ ‘ꭰꮒᏼꮻ’ ꭴꮎꮥꮕꭲ” diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-008-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-008-ref.html deleted file mode 100644 index aa0850be9689..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-008-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

«ένα “δύο” τρία» -

«ένα “δύο” τρία» diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-009-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-009-ref.html deleted file mode 100644 index 279e7f4ae17c..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-009-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

«یک ‹دو› سه» -

«یک ‹دو› سه» diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-010-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-010-ref.html deleted file mode 100644 index cd37a2628d5f..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-010-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

«un «deux» trois» -

«un «deux» trois» diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-011-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-011-ref.html deleted file mode 100644 index b61c264b48a7..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-011-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

«un ‹deux› trois» -

«un ‹deux› trois» diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-012-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-012-ref.html deleted file mode 100644 index 9c28ad7d0a5c..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-012-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

“એક ‘બે’ રણ” -

“એક ‘બે’ રણ” diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-013-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-013-ref.html deleted file mode 100644 index 0e10cba11755..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-013-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

”אחת ’שתיים’ שלוש” -

”אחת ’שתיים’ שלוש” diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-014-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-014-ref.html deleted file mode 100644 index 0b82e024edef..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-014-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

“एक ‘दो’ तीन” -

“एक ‘दो’ तीन” diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-015-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-015-ref.html deleted file mode 100644 index 3417d6035b7b..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-015-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

„egy »kettő« három” -

„egy »kettő« három” diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-016-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-016-ref.html deleted file mode 100644 index b70e7d423c7b..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-016-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

「一 『二』 三」 -

「一 『二』 三」 diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-017-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-017-ref.html deleted file mode 100644 index 7039368035f2..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-017-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

“មួយ ‘ពីរ’ បី” -

“មួយ ‘ពីរ’ បី” diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-018-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-018-ref.html deleted file mode 100644 index c022d3f413c3..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-018-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

“하나 ‘둘’ 셋” -

“하나 ‘둘’ 셋” diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-019-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-019-ref.html deleted file mode 100644 index aa80c978a67c..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-019-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

“ຫນຶ່ງ ‘ສອງ’ ສາມ” -

“ຫນຶ່ງ ‘ສອງ’ ສາມ” diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-020-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-020-ref.html deleted file mode 100644 index 6629270839d5..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-020-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

“တစ် ‘နှစ်’ သုံး” -

“တစ် ‘နှစ်’ သုံး” diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-021-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-021-ref.html deleted file mode 100644 index 022dd1678181..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-021-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

‘een “twee” drie’ -

‘een “twee” drie’ diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-022-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-022-ref.html deleted file mode 100644 index 8c6d3937f686..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-022-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

“ਇੱਕ ‘ਦੋ’ ਤਿੰਨ” -

“ਇੱਕ ‘ਦੋ’ ਤਿੰਨ” diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-023-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-023-ref.html deleted file mode 100644 index 022f6f3cbaaa..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-023-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

“ஒன்று ‘இரண்டு’ மூன்று” -

“ஒன்று ‘இரண்டு’ மூன்று” diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-024-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-024-ref.html deleted file mode 100644 index 074069f7f07f..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-024-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

“หนึ่ง‘สอง’สาม” -

“หนึ่ง‘สอง’สาม” diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-025-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-025-ref.html deleted file mode 100644 index 45f41d8e86f6..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-025-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

“一 ‘二’ 三” -

“一 ‘二’ 三” diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-026-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-026-ref.html deleted file mode 100644 index 247007348f32..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-026-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

「一 『二』 三」 -

「一 『二』 三」 diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-027-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-027-ref.html deleted file mode 100644 index 8ccc0e310e61..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-027-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

“一 ‘二’ 三” -

“一 ‘二’ 三” diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-028-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-028-ref.html deleted file mode 100644 index 48b98caefca2..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-028-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

One “two ‘three «four ‹five ‹six››»’” -

One “two ‘three «four ‹five ‹six››»’” diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-029-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-029-ref.html deleted file mode 100644 index 4d37e5037606..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-029-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

One two three «four ‹five ‹six››» -

One two three «four ‹five ‹six››» diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-030-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-030-ref.html deleted file mode 100644 index 67c60adda2ee..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-030-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

One “two 『three «four»』” -

One “two 『three «four»』” diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-031-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-031-ref.html deleted file mode 100644 index a4732c379e8c..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-031-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if the quote marks in both lines match: -

One ‹two ‹three ‹four››› -

One ‹two ‹three ‹four››› diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-032-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-032-ref.html deleted file mode 100644 index 2ba542328aae..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-032-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if both lines match, with no quote marks: -

One two three four -

One two three four diff --git a/testing/web-platform/tests/css/css-content/reference/quotes-033-ref.html b/testing/web-platform/tests/css/css-content/reference/quotes-033-ref.html deleted file mode 100644 index 99d1e75ddb30..000000000000 --- a/testing/web-platform/tests/css/css-content/reference/quotes-033-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -CSS Generated Content reference: quotes - - - -

Test passes if quote marks in both lines match: -

One two “three ‘four’” five -

One two “three ‘four’” five diff --git a/xpcom/ds/nsAtom.h b/xpcom/ds/nsAtom.h index 7b73fd4a48cc..9212015d97c6 100644 --- a/xpcom/ds/nsAtom.h +++ b/xpcom/ds/nsAtom.h @@ -276,7 +276,7 @@ class nsAtomString : public nsString { class nsAtomCString : public nsCString { public: - explicit nsAtomCString(const nsAtom* aAtom) { aAtom->ToUTF8String(*this); } + explicit nsAtomCString(nsAtom* aAtom) { aAtom->ToUTF8String(*this); } }; class nsDependentAtomString : public nsDependentString {