merge mozilla-central to mozilla-inbound. r=merge a=merge

This commit is contained in:
Sebastian Hengst 2017-09-04 00:17:34 +02:00
Родитель 616f60eb84 ac835df167
Коммит 7962b41fa5
13 изменённых файлов: 295 добавлений и 249 удалений

Просмотреть файл

@ -72,9 +72,11 @@ static const RedirEntry kRedirMap[] = {
nsIAboutModule::ALLOW_SCRIPT |
nsIAboutModule::HIDE_FROM_ABOUTABOUT },
{ "sessionrestore", "chrome://browser/content/aboutSessionRestore.xhtml",
nsIAboutModule::ALLOW_SCRIPT },
nsIAboutModule::ALLOW_SCRIPT |
nsIAboutModule::HIDE_FROM_ABOUTABOUT },
{ "welcomeback", "chrome://browser/content/aboutWelcomeBack.xhtml",
nsIAboutModule::ALLOW_SCRIPT },
nsIAboutModule::ALLOW_SCRIPT |
nsIAboutModule::HIDE_FROM_ABOUTABOUT },
// Linkable because of indexeddb use (bug 1228118)
{ "home", "chrome://browser/content/abouthome/aboutHome.xhtml",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

Просмотреть файл

@ -1811,14 +1811,14 @@ MediaFormatReader::NotifyError(TrackType aTrack, const MediaResult& aError)
// NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER because we were doing HW decoding.
// Now, save the related data and we will report the recovery time when a new
// decoder is ready.
if (aTrack == TrackType::kVideoTrack &&
aError == NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER &&
!aError.GPUCrashTimeStamp().IsNull()) {
GPUProcessCrashTelemetryLogger::RecordGPUCrashData(mMediaDecoderOwnerID,
&decoder,
aError.GPUCrashTimeStamp(),
TimeStamp::Now());
if (aTrack == TrackType::kVideoTrack &&
aError == NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER &&
!aError.GPUCrashTimeStamp().IsNull()) {
GPUProcessCrashTelemetryLogger::RecordGPUCrashData(mMediaDecoderOwnerID,
&decoder,
aError.GPUCrashTimeStamp(),
TimeStamp::Now());
}
ScheduleUpdate(aTrack);
@ -2014,12 +2014,12 @@ MediaFormatReader::DecodeDemuxedSamples(TrackType aTrack,
(const MediaDataDecoder::DecodedData& aResults) {
decoder.mDecodeRequest.Complete();
NotifyNewOutput(aTrack, aResults);
// When we recovered from a GPU crash and get the first decoded
// frame, report the recovery time telemetry.
if (aTrack == TrackType::kVideoTrack) {
GPUProcessCrashTelemetryLogger::ReportTelemetry(
mMediaDecoderOwnerID, &decoder);
// When we recovered from a GPU crash and get the first decoded
// frame, report the recovery time telemetry.
if (aTrack == TrackType::kVideoTrack) {
GPUProcessCrashTelemetryLogger::ReportTelemetry(
mMediaDecoderOwnerID, &decoder);
}
},
[self, this, aTrack, &decoder](const MediaResult& aError) {

Просмотреть файл

@ -21,21 +21,21 @@ using namespace layers;
using namespace gfx;
#ifdef XP_WIN
static void
ReportUnblacklistingTelemetry(bool isGPUProcessCrashed,
const nsCString& aD3D11BlacklistedDriver,
const nsCString& aD3D9BlacklistedDriver)
{
const nsCString& blacklistedDLL = !aD3D11BlacklistedDriver.IsEmpty()
? aD3D11BlacklistedDriver
: aD3D9BlacklistedDriver;
if (!blacklistedDLL.IsEmpty()) {
Telemetry::Accumulate(Telemetry::VIDEO_UNBLACKINGLISTING_DXVA_DRIVER_RUNTIME_STATUS,
blacklistedDLL,
isGPUProcessCrashed ? 1 : 0);
}
}
static void
ReportUnblacklistingTelemetry(bool isGPUProcessCrashed,
const nsCString& aD3D11BlacklistedDriver,
const nsCString& aD3D9BlacklistedDriver)
{
const nsCString& blacklistedDLL = !aD3D11BlacklistedDriver.IsEmpty()
? aD3D11BlacklistedDriver
: aD3D9BlacklistedDriver;
if (!blacklistedDLL.IsEmpty()) {
Telemetry::Accumulate(Telemetry::VIDEO_UNBLACKINGLISTING_DXVA_DRIVER_RUNTIME_STATUS,
blacklistedDLL,
isGPUProcessCrashed ? 1 : 0);
}
}
#endif // XP_WIN
VideoDecoderChild::VideoDecoderChild()
@ -148,7 +148,7 @@ VideoDecoderChild::ActorDestroy(ActorDestroyReason aWhy)
RefPtr<VideoDecoderChild> ref = this;
GetManager()->RunWhenRecreated(
NS_NewRunnableFunction("dom::VideoDecoderChild::ActorDestroy", [=]() {
MediaResult error(NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER);
MediaResult error(NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER);
error.SetGPUCrashTimeStamp(ref->mGPUCrashTime);
if (ref->mInitialized) {
mDecodedData.Clear();
@ -182,7 +182,7 @@ VideoDecoderChild::InitIPDL(const VideoInfo& aVideoInfo,
// The manager isn't available because VideoDecoderManagerChild has been
// initialized with null end points and we don't want to decode video on GPU
// process anymore. Return false here so that we can fallback to other PDMs.
if (!manager) {
if (!manager) {
return false;
}
@ -246,7 +246,7 @@ VideoDecoderChild::Decode(MediaRawData* aSample)
AssertOnManagerThread();
if (mNeedNewDecoder) {
MediaResult error(NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER);
MediaResult error(NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER);
error.SetGPUCrashTimeStamp(mGPUCrashTime);
return MediaDataDecoder::DecodePromise::CreateAndReject(error, __func__);
}
@ -286,7 +286,7 @@ VideoDecoderChild::Flush()
mDecodePromise.RejectIfExists(NS_ERROR_DOM_MEDIA_CANCELED, __func__);
mDrainPromise.RejectIfExists(NS_ERROR_DOM_MEDIA_CANCELED, __func__);
if (mNeedNewDecoder) {
MediaResult error(NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER);
MediaResult error(NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER);
error.SetGPUCrashTimeStamp(mGPUCrashTime);
return MediaDataDecoder::FlushPromise::CreateAndReject(error, __func__);
}
@ -301,7 +301,7 @@ VideoDecoderChild::Drain()
{
AssertOnManagerThread();
if (mNeedNewDecoder) {
MediaResult error(NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER);
MediaResult error(NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER);
error.SetGPUCrashTimeStamp(mGPUCrashTime);
return MediaDataDecoder::DecodePromise::CreateAndReject(error, __func__);
}

Просмотреть файл

@ -24,10 +24,10 @@
#endif
namespace mozilla {
#ifdef XP_WIN
extern const nsCString GetFoundD3D11BlacklistedDLL();
extern const nsCString GetFoundD3D9BlacklistedDLL();
#ifdef XP_WIN
extern const nsCString GetFoundD3D11BlacklistedDLL();
extern const nsCString GetFoundD3D9BlacklistedDLL();
#endif // XP_WIN
namespace dom {

Просмотреть файл

@ -410,24 +410,24 @@ FindD3D9BlacklistedDLL()
"media.wmf.disable-d3d9-for-dlls");
}
const nsCString
GetFoundD3D11BlacklistedDLL()
{
if (sD3D11BlacklistingCache) {
return sD3D11BlacklistingCache->mBlacklistedDLL;
}
return nsCString();
}
const nsCString
GetFoundD3D9BlacklistedDLL()
{
if (sD3D9BlacklistingCache) {
return sD3D9BlacklistingCache->mBlacklistedDLL;
}
return nsCString();
const nsCString
GetFoundD3D11BlacklistedDLL()
{
if (sD3D11BlacklistingCache) {
return sD3D11BlacklistingCache->mBlacklistedDLL;
}
return nsCString();
}
const nsCString
GetFoundD3D9BlacklistedDLL()
{
if (sD3D9BlacklistingCache) {
return sD3D9BlacklistingCache->mBlacklistedDLL;
}
return nsCString();
}
class CreateDXVAManagerEvent : public Runnable

Просмотреть файл

@ -543,7 +543,7 @@ public class BrowserApp extends GeckoApp
return true;
case KeyEvent.KEYCODE_R:
tab.doReload(false);
tab.doReload(event.isShiftPressed() ? true : false);
return true;
case KeyEvent.KEYCODE_PERIOD:

Просмотреть файл

@ -6,6 +6,7 @@ package org.mozilla.gecko.preferences;
import android.app.AlertDialog;
import android.content.Context;
import android.view.LayoutInflater;
import org.mozilla.gecko.R;
@ -20,6 +21,8 @@ public class TopSitesPanelsPreference extends PanelsPreference {
@Override
protected void configureDialogBuilder(AlertDialog.Builder builder) {
final LayoutInflater inflater = LayoutInflater.from(getContext());
builder.setView(R.layout.preference_topsites_panel_dialog);
builder.setView(inflater.inflate(R.layout.preference_topsites_panel_dialog, null));
}
}
}

Просмотреть файл

@ -1140,4 +1140,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
static const int32_t kUnknownId = -1;
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1512840146405000);
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1512927270423000);

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -8,7 +8,7 @@
/*****************************************************************************/
#include <stdint.h>
const PRTime gPreloadListExpirationTime = INT64_C(1515259337108000);
const PRTime gPreloadListExpirationTime = INT64_C(1515346460948000);
%%
0-1.party, 1
0.me.uk, 1
@ -118,7 +118,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1515259337108000);
1600esplanade.com, 1
16164f.com, 1
1644091933.rsc.cdn77.org, 1
173vpn.cn, 1
174.net.nz, 1
1750studios.com, 0
17hats.com, 1
@ -245,7 +244,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1515259337108000);
38888msc.com, 1
393335.ml, 1
398.info, 1
3ags.de, 1
3bakayottu.com, 1
3bigking.com, 1
3c-d.de, 1
@ -321,7 +319,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1515259337108000);
500p.xyz, 1
50plusnet.nl, 1
513vpn.net, 1
517vpn.cn, 1
525.info, 1
52neptune.com, 1
5432.cc, 1
@ -334,7 +331,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1515259337108000);
57aromas.com, 1
5apps.com, 1
5c1fd0f31022cbc40af9f785847baaf9.space, 1
5ece.de, 1
5francs.com, 1
5gb.space, 1
5h0r7.com, 1
@ -342,7 +338,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1515259337108000);
605508.cc, 1
605508.com, 1
646.io, 0
64616e.xyz, 1
64bitgaming.de, 1
6541166.com, 1
6542277.com, 1
@ -867,6 +862,7 @@ agridir.site, 1
agroline.by, 1
agroyard.com.ua, 1
agsb.ch, 1
agtv.com.br, 1
agung-furniture.com, 1
agwa.name, 1
ahcpr.gov, 0
@ -1085,7 +1081,6 @@ alicialab.org, 1
alienation.biz, 1
alienstat.com, 1
alignrs.com, 1
alilialili.ga, 1
alinasmusicstudio.com, 1
alinode.com, 1
alisonisrealestate.com, 1
@ -1726,13 +1721,13 @@ arksan.com.tr, 1
arlatools.com, 1
arlen.tv, 1
arlenarmageddon.com, 1
arlet.click, 1
armadaquadrat.com, 1
armandsdiscount.com, 1
armarinhovirtual.com.br, 1
armazemdaminiatura.com.br, 1
armenians.online, 1
armil.it, 1
arminpech.de, 1
armleads.com, 1
armstrongsengineering.com, 1
army24.cz, 1
@ -1766,7 +1761,6 @@ arrowwebprojects.nl, 1
arsenal.ru, 1
arsk1.com, 1
art-et-culture.ch, 1
art2web.net, 1
artansoft.com, 1
artbytik.ru, 1
artdeco-photo.com, 1
@ -2348,6 +2342,7 @@ barrut.me, 0
bars.kh.ua, 1
barslecht.com, 1
barslecht.nl, 1
barta.me, 1
bartel.ws, 1
bartelt.name, 1
bartlamboo.nl, 1
@ -2805,6 +2800,7 @@ biletru.net, 1
bilgo.com, 1
bilke.org, 1
billaud.eu.org, 1
billdestler.com, 1
billgoldstein.name, 1
billiger-mietwagen.de, 1
billigpoker.dk, 1
@ -3236,6 +3232,8 @@ booktracker-org.appspot.com, 1
bookwitty.social, 1
bool.be, 1
boomersurf.com, 1
boomsaki.com, 1
boomsakis.com, 1
boomshelf.com, 1
boomshelf.org, 1
boonbox.com, 1
@ -3404,7 +3402,6 @@ breeethretail.ru, 0
breest.net, 1
breeswish.org, 1
breeyn.com, 1
brefy.com, 1
brege.org, 1
breitbild-beamer.de, 1
brejoc.com, 1
@ -3678,7 +3675,6 @@ byji.com, 1
byken.cn, 1
bymark.co, 1
bymike.co, 1
bynumlaw.net, 1
byrko.cz, 1
byrko.sk, 1
byronr.com, 1
@ -3752,6 +3748,7 @@ cafelandia.net, 1
cafeobscura.nl, 1
caferagazzi.de, 1
caffeinatedcode.com, 1
cainhosting.com, 0
caipai.fm, 1
cairnterrier.com.br, 1
cais.de, 1
@ -3887,7 +3884,6 @@ capture-app.com, 1
captured-symphonies.com, 1
caputo.com, 1
caputodesign.com, 1
car-shop.top, 1
car.info, 1
car24.de, 1
car24portal.de, 1
@ -3944,7 +3940,6 @@ carlgo11.com, 1
carlife-at.jp, 1
carlingfordapartments.com.au, 1
carlmjohnson.net, 1
carloshmm.stream, 1
carlosjeurissen.com, 1
carlovanwyk.com, 1
carnaticalifornia.com, 1
@ -4053,6 +4048,7 @@ ccretreatandfarm.com, 1
ccsys.com, 1
cctld.com, 1
cctvview.info, 1
ccu.io, 1
ccu.plus, 1
ccv-deutschland.de, 1
ccv.ch, 1
@ -4390,7 +4386,6 @@ chocotough.nl, 0
chocoweb.net, 1
chodocu.com, 1
chokladfantasi.net, 1
chon.io, 1
chonghe.org, 1
chook.as, 1
choosemypc.net, 1
@ -4473,7 +4468,6 @@ chrpaul.de, 1
chrstn.eu, 1
chsh.moe, 1
chsterz.de, 1
chua.family, 1
chuchote-moi.fr, 1
chuck.ovh, 1
chuckame.fr, 1
@ -4806,6 +4800,7 @@ codenode.io, 1
codeplay.org, 1
codepoints.net, 1
codepref.com, 1
codepult.com, 1
codera.co.uk, 1
codercy.com, 1
codereview.appspot.com, 0
@ -4975,6 +4970,7 @@ compartir.party, 1
compassdirectportal.com, 1
compeuphoria.com, 1
compibus.fr, 1
compilenix.org, 1
completefloorcoverings.com, 1
completesecurityessex.co.uk, 1
completesecurityessex.com, 1
@ -5284,6 +5280,7 @@ create-ls.jp, 1
createursdefilms.com, 1
creations-edita.com, 1
creative-coder.de, 1
creative-wave.fr, 1
creativeartifice.com, 1
creativebites.de, 1
creativecaptiv.es, 1
@ -5426,13 +5423,11 @@ cspvalidator.org, 1
css.net, 1
cssai.eu, 1
cssaunion.com, 1
cssps.org, 1
cstkit.com, 0
cstp-marketing.com, 1
csuw.net, 1
csvalpha.nl, 1
cthomas.work, 1
ctj.im, 1
ctliu.com, 1
ctnguyen.de, 1
ctnguyen.net, 1
@ -5466,12 +5461,12 @@ cuisinezest.com, 1
cultiv.nl, 1
cultivo.bio, 1
cultofperf.org.uk, 1
culture-school.top, 1
culturedcode.com, 1
cultureroll.com, 1
cuni-cuni-club.com, 1
cuni-rec.com, 1
cuoc.org.uk, 1
cuongthach.com, 1
cuonic.com, 1
cup.al, 1
cupcake.io, 1
@ -5775,6 +5770,7 @@ dart-tanke.de, 1
darth-sonic.de, 1
dartsdon.jp, 1
darwinkel.net, 0
daryl.moe, 1
darylcumbo.net, 1
das-mediale-haus.de, 1
das-sommercamp.de, 1
@ -5877,7 +5873,6 @@ dawson-floridavilla.co.uk, 1
day-peak.com, 1
daylightpirates.org, 1
dayman.net, 1
days.one, 1
daysoftheyear.com, 1
db-sanity.com, 1
db-works.nl, 1
@ -5989,7 +5984,6 @@ dedimax.de, 1
dedmorozrzn.ru, 1
deduijventil.nl, 1
dee.su, 1
deep.club, 1
deepbluecrafting.co.uk, 1
deepcreampie.com, 1
deeprecce.com, 1
@ -7003,7 +6997,6 @@ dzsula.hu, 1
dzyabchenko.com, 1
e-apack.com.br, 1
e-briancon.com, 1
e-hon.link, 1
e-kontakti.fi, 1
e-learningbs.com, 1
e-lifetechnology.com, 1
@ -7183,6 +7176,7 @@ edsm.net, 1
edtechwebb.com, 1
edu6.cloud, 1
eduard-dopler.de, 1
eduardnikolenko.ru, 1
edubras.com.br, 1
educaid.be, 1
educationevolving.org, 1
@ -7367,7 +7361,6 @@ elexel.ru, 1
elglobo.com.mx, 1
elgosblanc.com, 1
elhall.pro, 1
elhall.ru, 1
elhamadimi.com, 1
elhossari.com, 1
elia.cloud, 1
@ -7539,6 +7532,7 @@ engarde.net, 1
engaugetools.com, 1
engelundlicht.ch, 1
engg.ca, 1
engineowning.com, 1
enginepit.com, 1
enginx.net, 1
englerts.de, 1
@ -7566,6 +7560,7 @@ enquos.com, 1
enriquepiraces.com, 1
ensage.io, 1
enscosupply.com, 1
ensemble-rubato.de, 1
ensons.de, 1
ensured.com, 1
ensured.nl, 1
@ -7620,7 +7615,7 @@ epistas.de, 1
epizentrum.work, 1
epizentrum.works, 1
epmcentroitalia.it, 1
epoch.com, 0
epoch.com, 1
epolitiker.com, 1
epossystems.co.uk, 1
epostplus.li, 1
@ -7919,6 +7914,7 @@ everyarti.st, 1
everyday.eu.org, 1
everydaytherich.com, 1
everyex.com, 1
everygayporn.com, 1
everymove.org, 1
everywhere.cloud, 1
eveseat.net, 1
@ -8287,7 +8283,6 @@ feel.aero, 1
feelgood-workouts.de, 1
feen.us, 1
fefelovalex.ru, 1
fefore.com, 1
fegans.org.uk, 1
fehngarten.de, 1
fehnladen.de, 1
@ -8336,6 +8331,7 @@ ferrolatino.ch, 1
ferticare.pt, 1
fertila.de, 1
feschiyan.com, 1
festival.house, 1
festivaljapon.com, 1
festivalxdentro.com, 1
fetch.co.uk, 1
@ -8465,7 +8461,6 @@ firebaseio.com, 1
firebirdrangecookers.com, 1
firebounty.com, 1
fireboxfood.com, 1
firebugmusic.com, 1
firecore.com, 1
firecry.org, 1
firefart.at, 1
@ -8994,6 +8989,7 @@ fromix.de, 1
fromlemaytoz.com, 1
fromscratch.rocks, 1
fromthesoutherncross.com, 1
front-end.dog, 1
fronteers.nl, 0
frontline.cloud, 1
frontline6.com, 1
@ -9305,6 +9301,7 @@ gdutnic.com, 1
gdv.me, 1
gdz-otvety.com, 1
gdz-spishy.com, 1
gdz.tv, 1
ge1.me, 0
ge3k.net, 0
gear-acquisition-syndrome.community, 1
@ -9518,6 +9515,7 @@ gha.st, 1
ghaglund.se, 1
ghcif.de, 1
ghislainphu.fr, 1
ghkim.net, 1
ghostblog.info, 1
ghostwritershigh.com, 1
ghrelinblocker.info, 1
@ -9672,7 +9670,6 @@ gmx.net, 1
gn00.com, 1
gnetion.com, 1
gnetwork.eu, 1
gnilebein.de, 1
gnom.me, 1
gnosticjade.net, 1
gnucashtoqif.us, 1
@ -9738,7 +9735,6 @@ goo.gl, 1
good-tips.pro, 1
goodfeels.net, 1
goodfurday.ca, 1
goodmengroup.de, 1
goods-memo.net, 1
goodsex4all.com.br, 1
goodvibesblog.com, 1
@ -9963,6 +9959,7 @@ groovygoldfish.org, 1
gropp.org, 1
groseb.net, 1
grossberger-ge.org, 1
grossell.ru, 1
grossmisconduct.news, 1
groszek.pl, 1
groth.im, 1
@ -10119,7 +10116,6 @@ habeo.si, 1
habtium.com, 1
habtium.es, 1
hachre.de, 1
hack.club, 1
hackademix.net, 1
hackanders.com, 1
hackbarth.guru, 1
@ -10127,7 +10123,6 @@ hackbubble.me, 1
hackcraft.net, 1
hackenkunjeleren.nl, 1
hackenturet.dk, 1
hacker.club, 1
hacker.deals, 1
hacker.one, 1
hacker.parts, 1
@ -10456,7 +10451,6 @@ hellersgas.com, 1
helles-koepfchen.de, 1
helloacm.com, 1
helloanselm.com, 1
hellofilters.com, 1
hellomouse.cf, 1
hellomouse.tk, 1
hellotandem.com, 1
@ -10713,7 +10707,6 @@ hogl.dk, 1
hohm.in, 1
hohnet.com, 1
hoiku-navi.com, 1
hoikuen-now.top, 1
hoken-wakaru.jp, 1
hokieprivacy.org, 1
hokify.at, 1
@ -10963,7 +10956,6 @@ hugolynx.fr, 1
huguesblanchard.paris, 1
huguesditciles.com, 1
huihui.moe, 1
huirongis.me, 0
huiser.nl, 1
huitaodang.com, 1
hukaloh.com, 1
@ -10988,6 +10980,7 @@ hundter.com, 1
hunter.io, 1
huntingdonlifesciences.com, 1
huntshomeinspections.com, 1
huongquynh.com, 1
hup.hu, 1
hupp.se, 1
hurd.is, 1
@ -11025,7 +11018,6 @@ hydra.zone, 1
hydrante.ch, 1
hydroagro.pl, 1
hydrocloud.net, 1
hydrodipcenter.nl, 1
hydronyx.me, 1
hydroturbine.info, 1
hydrozone.fr, 1
@ -11168,7 +11160,6 @@ idexxpublicationportal.com, 1
idgard.de, 1
idhosts.co.id, 1
idid.tk, 1
idinby.dk, 1
idiopolis.org, 1
idiotentruppe.de, 1
idmanagement.gov, 1
@ -11191,7 +11182,6 @@ ieeespmb.org, 1
iemas.azurewebsites.net, 1
iemb.cf, 1
ieval.ro, 1
ievgenialehner.com, 1
ifamily.top, 1
ifan.ch, 1
ifasec.de, 0
@ -11273,7 +11263,6 @@ ile-kalorii.pl, 1
ileat.com, 1
ilektronika-farmakeia-online.gr, 1
ilhansubasi.com, 1
ilikfreshweedstores.com, 1
illambias.ch, 1
illegalpornography.me, 1
illich.cz, 1
@ -11780,7 +11769,6 @@ isdown.cz, 1
isecrets.se, 1
iservicio.mx, 1
isgp-studies.com, 1
ishangirdhar.com, 1
ishiharaken.com, 1
ishome.org, 1
isidom.fr, 1
@ -12016,7 +12004,6 @@ jacobian.org, 1
jacobphono.com, 1
jacobsenarquitetura.com, 1
jacuzziprozone.com, 1
jadefalcons.de, 1
jadopado.com, 1
jaegerlacke.de, 1
jagerman.com, 1
@ -12131,7 +12118,6 @@ javalestari.com, 1
javamilk.com, 1
javascriptlab.fr, 1
javfree.me, 1
javilacat.info, 1
jawnelodzkie.org.pl, 1
jaxageto.de, 1
jaycouture.com, 1
@ -12427,6 +12413,8 @@ jopsens.de, 1
joran.org, 1
jordankmportal.com, 1
jordans.co.uk, 1
jordanscorporatelaw.com, 1
jordanstrustcompany.com, 1
jordikroon.nl, 1
joretapo.fr, 1
jornadasciberdefensa2016.es, 1
@ -12455,7 +12443,6 @@ joshharmon.me, 1
joshpanter.com, 1
joshplant.co.uk, 1
joshrickert.com, 1
joshschmelzle.com, 1
joshtriplett.org, 1
joshua-kuepper.de, 1
joshuajohnson.ca, 1
@ -12558,6 +12545,7 @@ junethack.net, 1
jungaa.fr, 1
jungesforumkonstanz.de, 1
jungleculture.co.za, 1
jungleducks.ca, 1
junglist.org, 1
juni.io, 1
juniwalk.cz, 1
@ -12624,6 +12612,7 @@ kabat-fans.cz, 1
kabeuchi.com, 1
kaboom.pw, 1
kabu-abc.com, 1
kabus.org, 1
kachlikova2.cz, 1
kack.website, 1
kadmec.com, 1
@ -12744,7 +12733,6 @@ kartonmodellbau.org, 1
karuneshjohri.com, 1
kasadara.com, 1
kasei.im, 1
kashdash.ca, 1
kashis.com.au, 1
kashmirobserver.net, 1
kasilag.me, 0
@ -12799,6 +12787,7 @@ kb3.net, 1
kba-online.de, 1
kbb-ev.de, 1
kbcequitas.hu, 1
kbfl.org, 1
kbit.dk, 1
kbjorklu.com, 1
kc-holzfaeller.de, 1
@ -13259,7 +13248,6 @@ korono.de, 1
korp.fr, 1
korrelzout.nl, 1
kortgebyr.dk, 1
koryfi.com, 1
kosaki.moe, 1
koscielniak-nieruchomosci.pl, 1
kosho.org, 1
@ -13573,7 +13561,6 @@ lanuovariviera.it, 1
lanyang.tk, 1
lanzamientovirtual.es, 1
laos.dating, 1
laospage.com, 1
laozhu.me, 1
lapassiondutrading.com, 1
lapetition.be, 1
@ -13583,7 +13570,6 @@ lapolla.com, 1
laposte.net, 1
lapotagere.ch, 1
lapparente-aise.ch, 1
laracode.eu, 1
laraeph.com, 1
laranara.se, 1
laraveldirectory.com, 1
@ -13945,12 +13931,6 @@ lhasaapso.com.br, 1
lheinrich.com, 1
li-ke.co.jp, 1
liangji.com.tw, 0
lianye1.cc, 1
lianye2.cc, 1
lianye3.cc, 1
lianye4.cc, 1
lianye5.cc, 1
lianye6.cc, 1
liaozheqi.cn, 1
liaronce.win, 1
libbitcoin.org, 1
@ -14166,7 +14146,6 @@ litz.ca, 1
litzenberger.ca, 1
liuboznaiko.eu, 1
liud.im, 1
liudon.org, 1
liujunyang.com, 1
liukang.tech, 1
liul.in, 1
@ -14475,7 +14454,6 @@ ludikovsky.name, 1
ludwig.im, 1
ludwigpro.net, 1
luehne.de, 1
luelistan.net, 1
luenwarneke.com, 1
luffyhair.com, 1
luftbild-siegerland.de, 1
@ -14595,6 +14573,7 @@ ma-plancha.ch, 1
ma2t.com, 1
maartenderaedemaeker.be, 1
maartenprovo.be, 1
maartenterpstra.xyz, 1
maartenvandekamp.nl, 1
mabulledu.net, 1
mac-i-tea.ch, 1
@ -15250,7 +15229,6 @@ mediterenopmaandag.nl, 1
medium.com, 1
mediumraw.org, 1
mediweed.tk, 1
medlineplus.gov, 1
medo64.com, 1
medovea.ru, 1
medpics.com, 1
@ -16214,6 +16192,7 @@ mutuelle.fr, 1
muusikoiden.net, 1
muwatenraqamy.org, 1
muzeumkomiksu.eu, 1
muzgra.in, 1
muzi.cz, 1
mv-wohnen.de, 1
mvbits.com, 1
@ -16482,6 +16461,7 @@ naminam.de, 1
namrs.net, 1
namu.moe, 1
namu.wiki, 1
nanami.moe, 1
nanarose.ch, 1
nanch.com, 1
nanderson.me, 1
@ -16675,7 +16655,6 @@ neeerd.org, 1
neel.ch, 1
neels.ch, 1
neemzy.org, 1
neer.io, 1
neet-investor.biz, 1
nefertitis.cz, 1
neftebitum-kngk.ru, 1
@ -16980,7 +16959,6 @@ niftiestsoftware.com, 1
nifume.com, 1
nigelwakefield.com, 1
niggemeier.cc, 1
nigger.racing, 1
night2stay.cn, 1
night2stay.com, 1
night2stay.de, 1
@ -17002,7 +16980,6 @@ nikksno.io, 1
niklasbabel.com, 1
nikobradshaw.com, 1
nikolaichik.photo, 1
nikolasbradshaw.com, 1
nikolasgrottendieck.com, 1
nikomo.fi, 0
nil.gs, 1
@ -17020,7 +16997,6 @@ ninetaillabs.xyz, 1
ning.so, 1
ninja-galerie.de, 1
ninjan.co, 1
ninjaspiders.com, 1
ninofink.com, 1
ninthfloor.org, 1
ninux.ch, 0
@ -17781,6 +17757,7 @@ osterkraenzchen.de, 1
ostr.io, 1
osusume-houhou.com, 1
oswaldmattgroup.com, 1
oswalds.co.uk, 1
oswaldsmillaudio.com, 1
osx86spain.com, 1
osxentwicklerforum.de, 1
@ -17965,7 +17942,6 @@ panicparts.com, 1
panier-legumes.bio, 1
panj.ws, 1
panmetro.com, 1
panoranordic.net, 1
panoti.com, 0
panpsychism.com, 1
panpsychist.com, 1
@ -18057,9 +18033,6 @@ pascal-wittmann.de, 1
pascalchristen.ch, 1
pascaline-jouis.fr, 1
pascalleguern.com, 1
pascalmathis.com, 1
pascalmathis.me, 1
pascalmathis.net, 1
pascalspoerri.ch, 1
pass.org.my, 1
passieposse.nl, 1
@ -18092,6 +18065,7 @@ pastaenprosecco.nl, 1
paste.fedoraproject.org, 1
pastebin.co.za, 1
pasternok.org, 1
pasteros.io, 1
pastie.se, 1
pastoral-verbund.de, 1
pastorbelgagroenendael.com.br, 1
@ -18335,7 +18309,6 @@ perspektivwechsel-coaching.de, 1
persson.im, 1
persson.me, 1
perucasestoril.com.br, 1
pervacio.hu, 1
perzeidi.hr, 1
pestalozzishop.com.br, 1
pestici.de, 1
@ -18407,6 +18380,7 @@ phcimages.com, 1
phcmembers.com, 1
phcnetworks.net, 1
phcorner.net, 1
phdwuda.com, 1
phelx.de, 1
phenomeno-porto.com, 1
phenomeno.nl, 1
@ -18457,6 +18431,7 @@ photographe-reims.com, 1
photographyforchange.com, 1
photographyforchange.org, 1
photomodelcasting.com, 1
photon.sh, 1
photops.fr, 1
phototag.org, 1
phototravel.uk, 1
@ -18935,7 +18910,6 @@ poupatempo.org, 1
pourlesenfants.info, 1
pourmesloisirs.com, 1
povareschka.ru, 1
powdersnow.top, 1
power-coonies.de, 1
power-fit.org, 1
power-flowengineer.com, 1
@ -18958,8 +18932,6 @@ pozyczka-bez-zaswiadczen.pl, 1
pozytywnyplan.pl, 1
pozzo-balbi.com, 1
ppipe.net, 1
ppmathis.ch, 1
ppmathis.com, 1
ppmoon.com, 1
ppoozl.com, 1
ppro.com, 1
@ -18982,7 +18954,6 @@ praxis-familienglueck.de, 1
prayerrequest.com, 1
prazeresdavida.com.br, 1
prazynka.pl, 1
prc.gov, 1
precedecaritas.com.br, 1
preciouslife.fr, 1
preciscx.com, 1
@ -19174,7 +19145,6 @@ propertygroup.pl, 1
propertyone.mk, 1
propipesystem.com, 1
propmag.co, 1
proposalonline.com, 1
propr.no, 1
propseller.com, 1
proslimdiets.com, 1
@ -19315,7 +19285,6 @@ pupboss.com, 1
purahealthyliving.com, 1
purevapeofficial.com, 1
purikore.com, 1
purplebricks.com, 1
purplemoon.ch, 1
purpleplains.net, 1
purplepr.bg, 1
@ -19505,7 +19474,6 @@ r-core.org, 1
r-cut.fr, 1
r-rwebdesign.com, 1
r0t.co, 1
r0uzic.net, 1
r2d2pc.com, 1
r3nt3r.com, 1
r3s1stanc3.me, 1
@ -19545,6 +19513,7 @@ radioheteroglossia.com, 1
radioilusion.es, 1
radiom.fr, 1
radiomodem.dk, 1
radiomontebianco.it, 1
radionicabg.com, 1
radiopolarniki.spb.ru, 1
radis-adopt.com, 1
@ -19615,6 +19584,7 @@ rapenroer.nl, 1
raphael.li, 1
raphaelcasazza.ch, 1
rapidapp.io, 1
rapido.nu, 1
rapidshit.net, 1
rapidstone.com, 1
rareative.com, 1
@ -19884,6 +19854,7 @@ relaybox.io, 1
release-monitoring.org, 1
reliancebank.bank, 1
religiousforums.com, 1
relsak.cz, 1
relvan.com, 1
remaimodern.org, 1
remambo.jp, 1
@ -19972,6 +19943,7 @@ ressl.ch, 1
restaurace-klokocka.cz, 1
restaurant-mangal.ch, 1
restaurant-rosengarten.at, 1
restaurantesimonetti.com.br, 1
restaurantmangal.ch, 1
rester-a-domicile.ch, 1
rester-autonome-chez-soi.ch, 1
@ -20138,6 +20110,7 @@ riverbanktearooms.co.uk, 1
riverford.co.uk, 1
rivermendhealthcenters.com, 1
riversideauto.net, 1
riversideradio.nl, 1
riverweb.gr, 1
rivy.org, 1
riyono.com, 1
@ -20281,6 +20254,7 @@ roofingomaha.com, 1
roofsandbasements.com, 1
rool.me, 1
room-checkin24.de, 1
room208.org, 1
room2d.com, 1
room3b.eu, 1
roombase.nl, 1
@ -20327,6 +20301,7 @@ rosset.net, 1
rosslug.org.uk, 1
rot47.net, 1
roten.email, 1
rotex1840.de, 1
rothkranz.net, 1
rothnater.ch, 1
rotol.me, 1
@ -20857,7 +20832,6 @@ schlarp.com, 1
schlechtewitze.com, 1
schlossereieder.at, 1
schmaeh-coaching.ch, 1
schmelzle.io, 1
schmidthomes.com, 1
schmidttulskie.de, 1
schmitt-max.com, 1
@ -21011,6 +20985,7 @@ sealbaker.com, 1
sealtitebasement.com, 1
seamless.no, 1
seanholcroft.co.uk, 1
seanstrout.com, 1
seansyardservice.com, 1
seaplayhomes.com, 1
search.yahoo.com, 0
@ -21049,7 +21024,6 @@ sec.ec, 1
sec.gd, 1
sec3ure.co.uk, 1
secanje.nl, 1
secboom.com, 1
seccomp.ru, 1
secctexasgiving.org, 0
secgui.de, 1
@ -21129,7 +21103,6 @@ securoswiss.ch, 1
secuvera.de, 1
secwall.me, 1
secwise.nl, 1
sedrubal.de, 1
sedussa.ro, 1
seeclop.ch, 1
seedbox.fr, 1
@ -21658,6 +21631,7 @@ silvergoldbull.uy, 1
silvergoldbull.uz, 1
silvergoldbull.ws, 1
silverlinkz.net, 1
silverseen.com, 1
silverstartup.sk, 1
silverwind.io, 1
silvistefi.com, 1
@ -21706,6 +21680,7 @@ simplidesigns.nl, 1
simplycharlottemason.com, 1
simplycloud.de, 1
simplyenak.com, 1
simplyhelen.de, 1
simplymozzo.se, 1
simplystudio.com, 1
simpte.com, 1
@ -21976,7 +21951,6 @@ smatch.com, 1
smb445.com, 1
smdavis.us, 1
smdcn.net, 1
sme-gmbh.net, 1
smeetsengraas.com, 1
smexpt.com, 1
smiatek.name, 1
@ -22020,7 +21994,6 @@ snap.com, 1
snapappointments.com, 1
snapfinance.com, 1
snapserv.ch, 1
snapserv.net, 1
snarf.in, 1
snatch.com.ua, 1
snazzie.nl, 1
@ -22220,7 +22193,6 @@ sotoasobi.net, 1
sou-co.jp, 1
soubriquet.org, 1
soufastnet.com.br, 1
sougi-review.top, 1
souki.cz, 1
soukodou.jp, 1
soul-source.co.uk, 1
@ -22462,7 +22434,6 @@ ss64.org, 1
ssa.gov, 0
ssbkk.ru, 1
ssbrm.ch, 1
ssdax.com, 1
ssh-keys.online, 1
ssh-vault.com, 1
ssky.cn, 1
@ -22485,6 +22456,7 @@ sslpoint.com, 1
ssls.cz, 1
sslsurvey.de, 1
sslzilla.de, 1
ssrvpn.tech, 1
sss3s.com, 1
sstaging.com, 1
sstewartgallus.com, 1
@ -22823,6 +22795,7 @@ stulda.cz, 1
stumf.si, 1
stuntmen.xyz, 1
stupendous.net, 1
sturbi.de, 1
sturdio.com.br, 1
sturge.co.uk, 1
stutelage.com, 1
@ -23135,7 +23108,6 @@ taartenfeesies.nl, 1
tabelfirme.ro, 1
tabernadovinho.com.br, 1
taberu-fujitsubo.com, 1
tabino.top, 1
tabithawebb.co.uk, 1
tabla-periodica.com, 1
tablescraps.com, 1
@ -23221,6 +23193,7 @@ tanto259.name, 1
tantotiempo.de, 1
tanzhijun.com, 1
taoburee.com, 1
taotuba.net, 1
tapestries.tk, 1
taquilla.com, 1
taqun.club, 1
@ -23497,7 +23470,6 @@ teracloud.at, 1
teranacreative.com, 1
teranga.ch, 1
teriiphotography.com, 1
termitemounds.org, 1
terrab.de, 0
terracloud.de, 0
terraelectronica.ru, 1
@ -23574,6 +23546,7 @@ thackbarth.net, 1
thaedal.net, 1
thagki9.com, 1
thai.dating, 1
thai.land, 0
thaicyberpoint.com, 1
thaiforest.ch, 1
thaigirls.xyz, 1
@ -23837,7 +23810,6 @@ thisbrownman.com, 1
thiscloudiscrap.com, 0
thisfreelife.gov, 1
thisishugo.com, 0
thisistheserver.com, 1
thismumdoesntknowbest.com, 1
thisoldearth.com, 1
thisserver.dontexist.net, 1
@ -23880,6 +23852,7 @@ threecrownsllp.com, 1
threedpro.me, 1
threefours.net, 1
threelions.ch, 1
threv.net, 1
thriveta.com, 1
thrivewellnesshub.co.za, 1
throttlerz.in, 1
@ -24241,6 +24214,7 @@ topnovini.com, 1
topodin.com, 1
topprice.ua, 1
topspeedgolf.com, 0
toptec.net.br, 1
toptenthebest.com, 1
toptexture.com, 1
toptranslation.com, 0
@ -24954,7 +24928,6 @@ unx.dk, 1
unxicdellum.cat, 1
upandclear.org, 1
upani.net, 1
upay.ru, 1
upbad.com, 1
upbeatrobot.com, 1
upbeatrobot.eu, 1
@ -24993,6 +24966,7 @@ urbanietz-immobilien.de, 1
urbanmelbourne.info, 1
urbannewsservice.com, 1
urbansparrow.in, 1
urbanstylestaging.com, 1
urbanwildlifealliance.org, 1
urbexdk.nl, 1
urcentral.com, 1
@ -25117,7 +25091,6 @@ valentineforpresident.com, 1
valentinesongs.com, 1
valentinritz.com, 1
valeriansaliou.name, 1
valesdigital.com, 1
validatis.com, 1
validator.nu, 1
validbrands.com, 1
@ -25496,7 +25469,6 @@ vmem.jp, 1
vmgirls.com, 1
vmis.nl, 1
vmoagents.com, 0
vmug.pl, 1
vn.search.yahoo.com, 0
vnd.cloud, 1
vnfs-team.com, 1
@ -25720,7 +25692,6 @@ watermonitor.gov, 1
watersb.org, 1
watertrails.io, 1
watsonwork.me, 1
wattechweb.com, 1
wave-ola.es, 1
wavesboardshop.com, 1
wavesoftime.com, 1
@ -25870,6 +25841,7 @@ weddywood.ru, 1
wedos.com, 1
weeblr.com, 1
weeblrpress.com, 1
weed.ren, 1
weedypedia.de, 1
weekdone.com, 1
weekly-residence.com, 1
@ -26538,7 +26510,7 @@ x.st, 1
x0r.be, 1
x1616.tk, 1
x23.eu, 1
x2c0.net, 1
x2c0.net, 0
x378.ch, 1
x509.io, 1
x64architecture.com, 1
@ -26571,6 +26543,7 @@ xeonlab.de, 1
xerblade.com, 1
xerhost.de, 0
xetown.com, 1
xfack.com, 1
xfd3.de, 1
xferion.com, 1
xfix.pw, 1
@ -26919,7 +26892,6 @@ yoga-prive.de, 1
yoga-school.xyz, 1
yoga-schwerin.de, 1
yoga-zentrum-narayani.de, 1
yoga.is-an-engineer.com, 1
yogananda-roma.org, 1
yogaschoolrishikesh.com, 1
yogeshbeniwal.com, 1
@ -26990,6 +26962,7 @@ yout.com, 1
youtous.me, 1
youtubedownloader.com, 1
youwatchporn.com, 1
youyoulemon.com, 1
yoyoost.duckdns.org, 1
ypart.eu, 1
ypcs.fi, 1
@ -27060,7 +27033,6 @@ yumeconcert.com, 1
yuna.tg, 1
yunity.org, 1
yunjishou.pro, 1
yunzhan.io, 1
yuricarlenzoli.it, 1
yurikirin.me, 1
yurimoens.be, 1
@ -27262,8 +27234,6 @@ zohar.wang, 0
zoigl.club, 1
zojadravai.com, 1
zoki.art, 1
zolokar.xyz, 1
zolotoy-standart.com.ua, 1
zombiesecured.com, 1
zomerschoen.nl, 1
zone-produkte.de, 1

Просмотреть файл

@ -1649,10 +1649,6 @@ impl ElementMethods for Element {
// https://dom.spec.whatwg.org/#dom-element-setattributenode
fn SetAttributeNode(&self, attr: &Attr) -> Fallible<Option<Root<Attr>>> {
// Workaround for https://github.com/servo/servo/issues/17366
// This ensures that if this is an "id" attr, its value is an Atom
attr.swap_value(&mut self.parse_plain_attribute(attr.local_name(), attr.Value()));
// Step 1.
if let Some(owner) = attr.GetOwnerElement() {
if &*owner != self {
@ -1660,6 +1656,15 @@ impl ElementMethods for Element {
}
}
let vtable = vtable_for(self.upcast());
// This ensures that the attribute is of the expected kind for this
// specific element. This is inefficient and should probably be done
// differently.
attr.swap_value(
&mut vtable.parse_plain_attribute(attr.local_name(), attr.Value()),
);
// Step 2.
let position = self.attrs.borrow().iter().position(|old_attr| {
attr.namespace() == old_attr.namespace() && attr.local_name() == old_attr.local_name()
@ -1688,7 +1693,7 @@ impl ElementMethods for Element {
self.attrs.borrow_mut()[position] = JS::from_ref(attr);
old_attr.set_owner(None);
if attr.namespace() == &ns!() {
vtable_for(self.upcast()).attribute_mutated(
vtable.attribute_mutated(
&attr, AttributeMutation::Set(Some(&old_attr.value())));
}

Просмотреть файл

@ -7,12 +7,13 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "clearTimeout",
"resource://gre/modules/Timer.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "ExtensionCommon",
"resource://gre/modules/ExtensionCommon.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "setTimeout",
"resource://gre/modules/Timer.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
clearTimeout: "resource://gre/modules/Timer.jsm",
E10SUtils: "resource:///modules/E10SUtils.jsm",
ExtensionCommon: "resource://gre/modules/ExtensionCommon.jsm",
setTimeout: "resource://gre/modules/Timer.jsm",
});
Cu.import("resource://gre/modules/ExtensionUtils.jsm");
const {
@ -288,3 +289,34 @@ const BrowserListener = {
addMessageListener("Extension:InitBrowser", BrowserListener);
addMessageListener("Extension:UnblockParser", BrowserListener);
var WebBrowserChrome = {
onBeforeLinkTraversal(originalTarget, linkURI, linkNode, isAppTab) {
return BrowserUtils.onBeforeLinkTraversal(originalTarget, linkURI, linkNode, isAppTab);
},
shouldLoadURI(docShell, URI, referrer, hasPostData, triggeringPrincipal) {
return true;
},
shouldLoadURIInThisProcess(URI) {
return E10SUtils.shouldLoadURIInThisProcess(URI);
},
reloadInFreshProcess(docShell, URI, referrer, triggeringPrincipal, loadFlags) {
return false;
},
startPrerenderingDocument(href, referrer, triggeringPrincipal) {
},
shouldSwitchToPrerenderedDocument(href, referrer, success, failure) {
return false;
},
};
if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) {
let tabchild = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsITabChild);
tabchild.webBrowserChrome = WebBrowserChrome;
}

Просмотреть файл

@ -10,6 +10,7 @@
#include "nsComponentManagerUtils.h"
#include "nsISupportsPrimitives.h"
#include "nsIMutableArray.h"
#include "nsXULAppAPI.h"
#include "prlink.h"
#include <gconf/gconf-client.h>
@ -76,6 +77,10 @@ nsGConfService::Init()
};
#undef FUNC
if (NS_WARN_IF(XRE_IsContentProcess())) {
return NS_ERROR_SERVICE_NOT_AVAILABLE;
}
if (!gconfLib) {
gconfLib = PR_LoadLibrary("libgconf-2.so.4");
if (!gconfLib)