From bcc143f7b3556f35d1d43a639383a2d540be768b Mon Sep 17 00:00:00 2001 From: roytam1 Date: Thu, 15 Jul 2021 10:00:23 +0800 Subject: [PATCH] partly imported from bk55: - import changes from tenfourfox: - closes #645: M171156 +TLDs TZs --- intl/icu/source/data/misc/metaZones.txt | 41 +------ intl/icu/source/data/misc/windowsZones.txt | 17 +-- layout/base/nsCSSFrameConstructor.cpp | 5 +- netwerk/dns/effective_tld_names.dat | 121 +++++++++++++++------ 4 files changed, 103 insertions(+), 81 deletions(-) diff --git a/intl/icu/source/data/misc/metaZones.txt b/intl/icu/source/data/misc/metaZones.txt index 9e5ea1d30a..c8101cacdd 100644 --- a/intl/icu/source/data/misc/metaZones.txt +++ b/intl/icu/source/data/misc/metaZones.txt @@ -708,7 +708,7 @@ metaZones:table(nofallback){ 001{"Asia/Yerevan"} } Yukon{ - 001{"America/Yakutat"} + 001{"America/Whitehorse"} } } metazoneInfo{ @@ -1127,11 +1127,6 @@ metaZones:table(nofallback){ "1970-01-01 00:00", "1983-10-30 11:00", } - { - "Yukon", - "1983-10-30 11:00", - "1983-11-30 09:00", - } { "Alaska", "1983-11-30 09:00", @@ -1547,18 +1542,13 @@ metaZones:table(nofallback){ } } "America:Dawson"{ - { - "Yukon", - "1970-01-01 00:00", - "1973-10-28 09:00", - } { "America_Pacific", "1973-10-28 09:00", "2020-11-01 07:00", } { - "America_Mountain", + "Yukon", "2020-11-01 07:00", "9999-12-31 23:59", } @@ -1889,21 +1879,11 @@ metaZones:table(nofallback){ "1970-01-01 00:00", "1980-04-27 10:00", } - { - "Yukon", - "1980-04-27 10:00", - "1980-10-26 10:00", - } { "America_Pacific", "1980-10-26 10:00", "1983-10-30 09:00", } - { - "Yukon", - "1983-10-30 09:00", - "1983-11-30 09:00", - } { "Alaska", "1983-11-30 09:00", @@ -2164,11 +2144,6 @@ metaZones:table(nofallback){ "1970-01-01 00:00", "1983-10-30 12:00", } - { - "Yukon", - "1983-10-30 12:00", - "1983-11-30 09:00", - } { "Alaska", "1983-11-30 09:00", @@ -2442,11 +2417,6 @@ metaZones:table(nofallback){ "1970-01-01 00:00", "1983-10-30 09:00", } - { - "Yukon", - "1983-10-30 09:00", - "1983-11-30 09:00", - } { "Alaska", "1983-11-30 09:00", @@ -2537,7 +2507,7 @@ metaZones:table(nofallback){ "2020-11-01 07:00", } { - "America_Mountain", + "Yukon", "2020-11-01 07:00", "9999-12-31 23:59", } @@ -2548,11 +2518,6 @@ metaZones:table(nofallback){ } } "America:Yakutat"{ - { - "Yukon", - "1970-01-01 00:00", - "1983-11-30 09:00", - } { "Alaska", "1983-11-30 09:00", diff --git a/intl/icu/source/data/misc/windowsZones.txt b/intl/icu/source/data/misc/windowsZones.txt index 4fe43fd359..1535e88559 100644 --- a/intl/icu/source/data/misc/windowsZones.txt +++ b/intl/icu/source/data/misc/windowsZones.txt @@ -213,7 +213,6 @@ windowsZones:table(nofallback){ KM{"Indian/Comoro"} MG{"Indian/Antananarivo"} SO{"Africa/Mogadishu"} - SS{"Africa/Juba"} TZ{"Africa/Dar_es_Salaam"} UG{"Africa/Kampala"} YT{"Indian/Mayotte"} @@ -305,6 +304,7 @@ windowsZones:table(nofallback){ BF{"Africa/Ouagadougou"} CI{"Africa/Abidjan"} GH{"Africa/Accra"} + GL{"America/Danmarkshavn"} GM{"Africa/Banjul"} GN{"Africa/Conakry"} GW{"Africa/Bissau"} @@ -616,6 +616,10 @@ windowsZones:table(nofallback){ ZW{"Africa/Harare"} ZZ{"Etc/GMT-2"} } + "South Sudan Standard Time"{ + 001{"Africa/Juba"} + SS{"Africa/Juba"} + } "Sri Lanka Standard Time"{ 001{"Asia/Colombo"} LK{"Asia/Colombo"} @@ -674,14 +678,14 @@ windowsZones:table(nofallback){ } "US Mountain Standard Time"{ 001{"America/Phoenix"} + CA{"America/Creston America/Dawson_Creek America/Fort_Nelson"} MX{"America/Hermosillo"} US{"America/Phoenix"} ZZ{"Etc/GMT+7"} } "UTC"{ - 001{"Etc/GMT"} - GL{"America/Danmarkshavn"} - ZZ{"Etc/GMT Etc/UTC"} + 001{"Etc/UTC"} + ZZ{"Etc/UTC Etc/GMT"} } "UTC+12"{ 001{"Etc/GMT-12"} @@ -812,10 +816,7 @@ windowsZones:table(nofallback){ } "Yukon Standard Time"{ 001{"America/Whitehorse"} - CA{ - "America/Whitehorse America/Creston America/Dawson America/Dawson_Cre" - "ek America/Fort_Nelson" - } + CA{"America/Whitehorse America/Dawson"} } } } diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index 25a5e58108..3f21ba3749 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -3463,8 +3463,11 @@ nsCSSFrameConstructor::ConstructTextFrame(const FrameConstructionData* aData, // Add the newly constructed frame to the flow aFrameItems.AddChild(newFrame); - if (!aState.mCreatingExtraFrames) + if (!aState.mCreatingExtraFrames || + (aContent->IsInNativeAnonymousSubtree() && + !aContent->GetPrimaryFrame())) { aContent->SetPrimaryFrame(newFrame); + } } /* static */ diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat index 66db9cf8a8..a91e02c541 100644 --- a/netwerk/dns/effective_tld_names.dat +++ b/netwerk/dns/effective_tld_names.dat @@ -734,7 +734,6 @@ gouv.ci // cl : https://www.nic.cl // Confirmed by .CL registry cl -aprendemas.cl co.cl gob.cl gov.cl @@ -6087,8 +6086,10 @@ biz.ss com.ss edu.ss gov.ss +me.ss net.ss org.ss +sch.ss // st : http://www.nic.st/html/policyrules/ st @@ -6097,7 +6098,6 @@ com.st consulado.st edu.st embaixada.st -gov.st mil.st net.st org.st @@ -7125,7 +7125,7 @@ org.zw // newGTLDs -// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2021-03-27T15:15:50Z +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2021-06-26T15:13:33Z // This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7544,7 +7544,7 @@ bridgestone // broadway : 2014-12-22 Celebrate Broadway, Inc. broadway -// broker : 2014-12-11 Dotbroker Registry Limited +// broker : 2014-12-11 Dog Beach, LLC broker // brother : 2015-01-29 Brother Industries, Ltd. @@ -8225,7 +8225,7 @@ football // ford : 2014-11-13 Ford Motor Company ford -// forex : 2014-12-11 Dotforex Registry Limited +// forex : 2014-12-11 Dog Beach, LLC forex // forsale : 2014-05-22 Dog Beach, LLC @@ -8645,9 +8645,6 @@ itau // itv : 2015-07-09 ITV Services Limited itv -// iveco : 2015-09-03 CNH Industrial N.V. -iveco - // jaguar : 2014-11-13 Jaguar Land Rover Ltd jaguar @@ -8966,7 +8963,7 @@ market // marketing : 2013-11-07 Binky Moon, LLC marketing -// markets : 2014-12-11 Dotmarkets Registry Limited +// markets : 2014-12-11 Dog Beach, LLC markets // marriott : 2014-10-09 Marriott Worldwide Corporation @@ -9095,6 +9092,9 @@ mtn // mtr : 2015-03-12 MTR Corporation Limited mtr +// music : 2021-05-04 DotMusic Limited +music + // mutual : 2015-04-02 Northwestern Mutual MU TLD Registry, LLC mutual @@ -9104,9 +9104,6 @@ nab // nagoya : 2013-10-24 GMO Registry, Inc. nagoya -// nationwide : 2015-07-23 Nationwide Mutual Insurance Company -nationwide - // natura : 2015-03-12 NATURA COSMÉTICOS S.A. natura @@ -9245,9 +9242,6 @@ onl // online : 2015-01-15 DotOnline Inc. online -// onyourside : 2015-07-23 Nationwide Mutual Insurance Company -onyourside - // ooo : 2014-01-09 INFIBEAM AVENUES LIMITED ooo @@ -9833,9 +9827,6 @@ sport // spot : 2015-02-26 Amazon Registry Services, Inc. spot -// spreadbetting : 2014-12-11 Dotspreadbetting Registry Limited -spreadbetting - // srl : 2015-05-07 InterNetX, Corp srl @@ -10049,7 +10040,7 @@ toys // trade : 2014-01-23 Elite Registry Limited trade -// trading : 2014-12-11 Dottrading Registry Limited +// trading : 2014-12-11 Dog Beach, LLC trading // training : 2013-11-07 Binky Moon, LLC @@ -10808,6 +10799,10 @@ apigee.io appspacehosted.com appspaceusercontent.com +// Appudo UG (haftungsbeschränkt) : https://www.appudo.com +// Submitted by Alexander Hochbaum +appudo.net + // Aptible : https://www.aptible.com/ // Submitted by Thomas Orozco on-aptible.com @@ -10837,6 +10832,10 @@ myasustor.com // Submitted by Andreas Weise myfritz.net +// AVStack Pte. Ltd. : https://avstack.io +// Submitted by Jasper Hugo +onavstack.net + // AW AdvisorWebsites.com Software Inc : https://advisorwebsites.com // Submitted by James Kennedy *.awdev.ca @@ -10877,6 +10876,10 @@ blackbaudcdn.net // Submitted by Luke Bratch of.je +// Blue Bite, LLC : https://bluebite.com +// Submitted by Joshua Weiss +bluebite.io + // Boomla : https://boomla.com // Submitted by Tibor Halter boomla.net @@ -10898,6 +10901,10 @@ square7.de bplaced.net square7.net +// Brendly : https://brendly.rs +// Submitted by Dusan Radovanovic +shop.brendly.rs + // BrowserSafetyMark // Submitted by Dave Tharp browsersafetymark.io @@ -11141,11 +11148,6 @@ cupcake.is // Submitted by Marvin Wiesner curv.dev -// Curvegrid Inc. : https://www.curvegrid.com/ -// Submitted by Pierre Rousset -multibaas.app -multibaas.com - // Customer OCI - Oracle Dyn https://cloud.oracle.com/home https://dyn.com/dns/ // Submitted by Gregory Drake // Note: This is intended to also include customer-oci.com due to wildcards implicitly including the current label @@ -11204,6 +11206,10 @@ builtwithdark.com // Submitted by Richard Li edgestack.me +// DDNS5 : https://ddns5.com +// Submitted by Cameron Elliott +ddns5.com + // Debian : https://www.debian.org/ // Submitted by Peter Palfrader / Debian Sysadmin Team debian.net @@ -11826,10 +11832,11 @@ app.os.stg.fedoraproject.org // FearWorks Media Ltd. : https://fearworksmedia.co.uk // submitted by Keith Fairley -conn.uk -copro.uk couk.me ukco.me +conn.uk +copro.uk +hosp.uk // Fermax : https://fermax.com/ // submitted by Koen Van Isterdael @@ -11874,13 +11881,17 @@ flynnhosting.net // Forgerock : https://www.forgerock.com // Submitted by Roderick Parr forgeblocks.com -*.id.forgerock.io +id.forgerock.io // Framer : https://www.framer.com // Submitted by Koen Rouwhorst framer.app framercanvas.com +// Frusky MEDIA&PR : https://www.frusky.de +// Submitted by Victor Pupynin +*.frusky.de + // RavPage : https://www.ravpage.co.il // Submitted by Roni Horowitz ravpage.co.il @@ -11947,8 +11958,9 @@ gsj.bz // GitHub, Inc. // Submitted by Patrick Toomey -github.io githubusercontent.com +githubpreview.dev +github.io // GitLab, Inc. // Submitted by Alex Hanselka @@ -12087,6 +12099,10 @@ blogspot.tw blogspot.ug blogspot.vn +// Goupile : https://goupile.fr +// Submitted by Niels Martignene +goupile.fr + // Group 53, LLC : https://www.group53.com // Submitted by Tyler Todd awsmppl.com @@ -12352,6 +12368,10 @@ myjino.ru *.spectrum.myjino.ru *.vps.myjino.ru +// Jotelulu S.L. : https://jotelulu.com +// Submitted by Daniel Fariña +jotelulu.cloud + // Joyent : https://www.joyent.com/ // Submitted by Brian Bennett *.triton.zone @@ -12531,6 +12551,11 @@ mcdir.ru mcpre.ru vps.mcdir.ru +// Mediatech : https://mediatech.by +// Submitted by Evgeniy Kozhuhovskiy +mediatech.by +mediatech.dev + // Medicom Health : https://medicomhealth.com // Submitted by Michael Olson hra.health @@ -12660,6 +12685,11 @@ nh-serv.co.uk // Submitted by Jeff Wheelhouse nfshost.com +// Noop : https://noop.app +// Submitted by Nathaniel Schweinberg +*.developer.app +noop.app + // Northflank Ltd. : https://northflank.com/ // Submitted by Marco Suter *.northflank.app @@ -12901,8 +12931,10 @@ orsites.com // Submitted by Yngve Pettersen operaunite.com -// Oursky Limited : https://skygear.io/ -// Submited by Skygear Developer +// Oursky Limited : https://authgear.com/, https://skygear.io/ +// Submited by Authgear Team , Skygear Developer +authgear-staging.com +authgearapps.com skygearapp.com // OutSystems @@ -12978,8 +13010,6 @@ perspecta.cloud // PE Ulyanov Kirill Sergeevich : https://airy.host // Submitted by Kirill Ulyanov lk3.ru -ra-ru.ru -zsew.ru // Planet-Work : https://www.planet-work.com/ // Submitted by Frédéric VANNIÈRE @@ -13014,6 +13044,13 @@ dyn53.io // Submitted by Zulfais co.bn +// Postman, Inc : https://postman.com +// Submitted by Rahul Dhawan +postman-echo.com +pstmn.io +mock.pstmn.io +httpbin.org + // prgmr.com : https://prgmr.com/ // Submitted by Sarah Newman xen.prgmr.com @@ -13045,8 +13082,8 @@ pubtls.org // PythonAnywhere LLP: https://www.pythonanywhere.com // Submitted by Giles Thomas -*.pythonanywhere.com -*.eu.pythonanywhere.com +pythonanywhere.com +eu.pythonanywhere.com // QOTO, Org. // Submitted by Jeffrey Phillips Freeman @@ -13144,6 +13181,10 @@ hzc.io wellbeingzone.eu wellbeingzone.co.uk +// Rico Developments Limited : https://adimo.co +// Submitted by Colin Brown +adimo.co.uk + // Rochester Institute of Technology : http://www.rit.edu/ // Submitted by Jennifer Herting git-pages.rit.edu @@ -13204,6 +13245,10 @@ seidat.net // Submitted by Felix Mönckemeyer senseering.net +// Sendmsg: https://www.sendmsg.co.il +// Submitted by Assaf Stern +minisite.ms + // Service Magnet : https://myservicemagnet.com // Submitted by Dave Sanders magnet.page @@ -13277,12 +13322,20 @@ srht.site // Submitted by Adrien Gillon stackhero-network.com +// Staclar : https://staclar.com +// Submitted by Matthias Merkel +novecore.site + // staticland : https://static.land // Submitted by Seth Vincent static.land dev.static.land sites.static.land +// Storebase : https://www.storebase.io +// Submitted by Tony Schirmer +storebase.store + // Strategic System Consulting (eApps Hosting): https://www.eapps.com/ // Submitted by Alex Oancea vps-host.net