Release 75.0.3770.53

This commit is contained in:
csagan5 2019-05-24 19:54:43 +02:00
parent 232dd7f970
commit 73b524f627
No known key found for this signature in database
GPG key ID: 64190A51D85DC0C5
15 changed files with 109 additions and 54 deletions

View file

@ -1,5 +1,9 @@
# 75.0.3770.53
* fix crash when downloading or from browser-initiated requests (fixes https://github.com/bromite/bromite/issues/309)
# 75.0.3770.50
* disable dynamic module loading
* more fixes to allow building for SDK 17
# 74.0.3729.162
* remove recent tabs signin

View file

@ -28,7 +28,7 @@ struct adblock_entry {
const char **domains, **domains_skip;
};
#define ADBLOCK_ENTRY_COUNT 57944
#define ADBLOCK_ENTRY_COUNT 57965
const char *m10030a28[] = { "/InsightTrk/", NULL };
const char *m1003aae2[] = { "qgpmtdrm.com^", NULL };
const char *m10043be [] = { "pro6e.com^", NULL };
@ -2333,7 +2333,6 @@ const char *m19b7f854[] = { "/adTools.", NULL };
const char *m19baa053[] = { "excolobar.com^", NULL };
const char *m19bb6420[] = { "ad.filmweb.pl^", NULL };
const char *m19bba946[] = { "nytimes.com/adx/images/ads/", "_buynow_btn_53x18.gif", NULL };
const char *m19bd3694[] = { "threepercenternation.com/chjRQbeSNa/", NULL };
const char *m19bd4e62[] = { "/ad300f2.", NULL };
const char *m19be8ecf[] = { "/clickability-", NULL };
const char *m19c06148[] = { "cssrvsync.com^", NULL };
@ -3782,6 +3781,7 @@ const char *m1fd53574[] = { "audience2media.com^", NULL };
const char *m1fd54261[] = { "yimg.com/gs/apex/mediastore/", NULL };
const char *m1fd5618 [] = { "zt-dst.com^", NULL };
const char *m1fd614f6[] = { "estocaf.info^", NULL };
const char *m1fd72d8d[] = { "cdn-files.prsmedia.fr^", "^xiti^", NULL };
const char *m1fd7305 [] = { "njrpynolojcel.com^", NULL };
const char *m1fd73e6c[] = { "c-planet.net^", NULL };
const char *m1fd8ff07[] = { "/OptimostPageCode.", NULL };
@ -13888,6 +13888,7 @@ const char *m4a113ef6[] = { "markethealth.com^", NULL };
const char *m4a1141e8[] = { "b76adf2b602.com^", NULL };
const char *m4a126e64[] = { "?g1t2h=", "&t1m2k3=", NULL };
const char *m4a134fa [] = { "api.facebook.com^", NULL };
const char *m4a13e3f7[] = { "yrcpupgqtn.com^", NULL };
const char *m4a147eec[] = { "qevkdmgcv.bid^", NULL };
const char *m4a14eeb [] = { "wshh.me/vast/", NULL };
const char *m4a161f71[] = { "sjsuspartans.com/ads2/", NULL };
@ -18210,6 +18211,7 @@ const char *m5cba339c[] = { "network.sofeminine.co.uk^", NULL };
const char *m5cbb1b66[] = { "ientrymail.com/webheadtools", NULL };
const char *m5cbc861 [] = { "/ads-02.", NULL };
const char *m5cbcded [] = { "/ad_text.", NULL };
const char *m5cbe82f6[] = { "rcudacimrqdlk.com^", NULL };
const char *m5cc15e0b[] = { "africal.info^", NULL };
const char *m5cc396ce[] = { "washtimes.com/static/images/SelectAutoWeather_v2.gif", NULL };
const char *m5cc434ff[] = { "yelp.co.uk/spice?", NULL };
@ -20071,6 +20073,7 @@ const char *m6429496a[] = { "nymag.com/js/2/metrony", NULL };
const char *m642add77[] = { "collarity.com^", NULL };
const char *m642b6dcc[] = { "jiwire.com^", NULL };
const char *m642bd0d7[] = { "pxlqyrteuuh.com^", NULL };
const char *m642cd3ae[] = { "rapidvideo.com/assets/js/", NULL };
const char *m642ce934[] = { "/logstat.", NULL };
const char *m642dd26b[] = { "asrock.com/images/ad-", NULL };
const char *m642fe10e[] = { "fjrlvkpjfimw.com^", NULL };
@ -22037,6 +22040,7 @@ const char *m6c16e61 [] = { "/newAdsScript.", NULL };
const char *m6c19a67a[] = { "adxpose.com^", NULL };
const char *m6c1c30c3[] = { "lfrqmuplp.com^", NULL };
const char *m6c1d8078[] = { "/advert6.", NULL };
const char *m6c1d8ab7[] = { "zzomiuob.com^", NULL };
const char *m6c1f1762[] = { "javsin.com/vip.html", NULL };
const char *m6c1f8572[] = { "fcstats.altervista.org^", NULL };
const char *m6c1fd1e4[] = { "rpcncuzsmpni.com^", NULL };
@ -25664,6 +25668,7 @@ const char *m7ae69417[] = { "fsitel.com^", NULL };
const char *m7aea22ef[] = { "vbdrzplqtgk.com^", NULL };
const char *m7aeba657[] = { "/getclicky.", NULL };
const char *m7aebab64[] = { "cfasync.gq^", NULL };
const char *m7aece7f4[] = { "polarcdn-terrax.com^", NULL };
const char *m7aefcd51[] = { "retag.xyz^", NULL };
const char *m7af424db[] = { "tracking.carprices.com^", NULL };
const char *m7af49c65[] = { "adscendmedia.com/gwjs.php?", NULL };
@ -26196,6 +26201,7 @@ const char *m7d321d7b[] = { "/html/ad.", NULL };
const char *m7d32b3ad[] = { "l.m.naver.com^", NULL };
const char *m7d332b5 [] = { "/bdcustomadsense-", NULL };
const char *m7d37a174[] = { "_engine_ads_", NULL };
const char *m7d382431[] = { "trustedform.com^", NULL };
const char *m7d39867d[] = { "rexbucks.com^", NULL };
const char *m7d3b72bd[] = { "searchtempest.com/clhimages/aocbanner.jpg", NULL };
const char *m7d3c1891[] = { "hypervre.com^", NULL };
@ -27780,6 +27786,7 @@ const char *m83efffec[] = { "dot-stat.radikal.ru^", NULL };
const char *m83f144a [] = { "nwooatwtmhfdh.bid^", NULL };
const char *m83f1609d[] = { "tvprocessing.com^", NULL };
const char *m83f34e3a[] = { "ptf.com/js/rc_banner.js", NULL };
const char *m83f5998f[] = { "aolcdn.com/ads/", NULL };
const char *m83f830a0[] = { "ozoltyqcnwmu.com^", NULL };
const char *m83faf62 [] = { "waymp.com^", NULL };
const char *m83fbc634[] = { "thankyouforadvertising.com^", NULL };
@ -32020,6 +32027,7 @@ const char *m96376454[] = { "images.", ".criteo.net^", NULL };
const char *m963766bf[] = { "speedtrap.shopdirect.com^", NULL };
const char *m9638b200[] = { "escdn.co/player", NULL };
const char *m9638dac1[] = { "duactinor.net^", NULL };
const char *m9638f6ef[] = { "gstatic.com/images/branding/", "/adsense", NULL };
const char *m963aa7ca[] = { "/w/d/capu.php?z=", NULL };
const char *m963aad61[] = { "unknowncheats.me/forum/images/ez/csgoban1.gif", NULL };
const char *m963bea56[] = { "180.76.2.18^", NULL };
@ -33603,6 +33611,7 @@ const char *m9cd43481[] = { "advmedialtd.com^", NULL };
const char *m9cd4a7bb[] = { "-blog-ad-", NULL };
const char *m9cd55815[] = { "cnx-software.com/pic/technexion/", NULL };
const char *m9cd6fc90[] = { "alfadirect.ru/api/analytics/latest?", NULL };
const char *m9cd704bb[] = { "hldsogaxfq.com^", NULL };
const char *m9cd7b6fa[] = { "/txt_adv.", NULL };
const char *m9cd9894e[] = { "assiniboine.mb.ca/files/intrasite_ads/", NULL };
const char *m9cda940 [] = { "pornstarnetwork.com^", "_660x70.jpg", NULL };
@ -35670,6 +35679,7 @@ const char *ma5870b1b[] = { "rapidgator.net/images/banners/", NULL };
const char *ma587fca1[] = { "_adserver/", NULL };
const char *ma58a7837[] = { "ibsrv.net/sidetiles/125x125/", NULL };
const char *ma58a8ec8[] = { "helsinkitimes.fi^", "^banners^", NULL };
const char *ma58aa8fc[] = { "threepercenternation.com/YghiZT/", NULL };
const char *ma58ac7ac[] = { "society6.com^", NULL };
const char *ma58ba1e [] = { "facebook.com/ads/profile/interests/", NULL };
const char *ma58ce4a2[] = { "mosdqxsgjhes.com^", NULL };
@ -36427,6 +36437,7 @@ const char *ma8ce7913[] = { "lowellsun.com/litebanner/", NULL };
const char *ma8d11158[] = { "unibet.co.uk/", "affiliate", NULL };
const char *ma8d26fb7[] = { "brothersincash.com^", NULL };
const char *ma8d296ed[] = { "nxewruvxprbd.com^", NULL };
const char *ma8d2a027[] = { "/ghn", ".", NULL };
const char *ma8d2eb51[] = { "servedbyadbutler.com/adserve/", NULL };
const char *ma8d34e0f[] = { "/xmladparser.", NULL };
const char *ma8d3e766[] = { "/17/ads/", NULL };
@ -38335,6 +38346,7 @@ const char *mb09de3ec[] = { "/adv03.", NULL };
const char *mb09efc92[] = { "/trackuity.", NULL };
const char *mb09f0d8e[] = { "/certifica-js14.js", NULL };
const char *mb09f25b4[] = { "tracker.downdetector.com^", NULL };
const char *mb0a16418[] = { "bclizbwet.com^", NULL };
const char *mb0a17228[] = { "/piwik.", NULL };
const char *mb0a1902c[] = { "-analitycs/fab.", NULL };
const char *mb0a1e1a2[] = { "otusnijhkyihod.com^", NULL };
@ -39054,6 +39066,7 @@ const char *mb395080 [] = { "aaqpajztftqw.com^", NULL };
const char *mb3961f8e[] = { "_middle_ads.", NULL };
const char *mb3967c07[] = { "mdn2015x2.com^", NULL };
const char *mb3968c37[] = { "drfflt.info^", NULL };
const char *mb39ab6da[] = { "yimg.com/ss/rapid", NULL };
const char *mb39abe0a[] = { "/misc/ads/", NULL };
const char *mb39db89b[] = { "rutube.ru/counters.html?", NULL };
const char *mb39e00ec[] = { "ge.com/sites/all/themes/ge_2012/assets/js/bin/s_code.js", NULL };
@ -40559,6 +40572,7 @@ const char *mba01cf4f[] = { ".biz/ad/", NULL };
const char *mba045172[] = { "/banners/460", NULL };
const char *mba065a1f[] = { "pornattitude.com^", NULL };
const char *mba06f0dc[] = { "sitemeter.com^", NULL };
const char *mba072b06[] = { "/wp-content/mu-plugins/google-analytics-dashboard-for-wp/", NULL };
const char *mba099206[] = { "ultjaimlrjlfl.com^", NULL };
const char *mba09cd3c[] = { "mkqepsxaz.bid^", NULL };
const char *mba0a7dc1[] = { "trust.zone^", NULL };
@ -40753,6 +40767,7 @@ const char *mbad18bf7[] = { "/TrackUser?callback=", NULL };
const char *mbad2965f[] = { "ubicast.tv/statics/mediaserver/player/statistics.js", NULL };
const char *mbad36709[] = { "tepazmynhvo.com^", NULL };
const char *mbad375ca[] = { "breakingisraelnews.com^", NULL };
const char *mbad3b227[] = { "nyvqazwtcwk.com^", NULL };
const char *mbad473b2[] = { "mstracker.net^", NULL };
const char *mbad4f6bc[] = { "jwgsepzz.com^", NULL };
const char *mbad50ff0[] = { "daclips.in^", NULL };
@ -43417,6 +43432,7 @@ const char *mc605deee[] = { "/ads/banner_", NULL };
const char *mc607697e[] = { "uwpmwpjlxblb.com^", NULL };
const char *mc6093956[] = { "/hc/tracking/", NULL };
const char *mc6099c07[] = { "unisys.com^", "^tracking.js", NULL };
const char *mc60a79f4[] = { "pixel.dorehernowi.pro^", NULL };
const char *mc60ac111[] = { "twitter.com^", "^scribe^", NULL };
const char *mc60c1e16[] = { "/konterayahoooo.", NULL };
const char *mc60d4b0b[] = { "/PageTrack.js", NULL };
@ -47315,6 +47331,7 @@ const char *md63b902e[] = { "pornsharing.com/App_Themes/pornsharianew/js/adpporn
const char *md63bffc9[] = { "admaster.net^", NULL };
const char *md63d218a[] = { "cal-one.net/ellington/deals_widget.php?", NULL };
const char *md63df5f4[] = { "xjzqmgyr.com^", NULL };
const char *md63e7d8c[] = { "dymzcxgdvf.com^", NULL };
const char *md63eb47 [] = { "qjskosdsxanp.com^", NULL };
const char *md63f4022[] = { "adslingers.com^", NULL };
const char *md640c125[] = { "/beacon_async.", NULL };
@ -47880,6 +47897,7 @@ const char *md89cfb36[] = { "adxat.com^", NULL };
const char *md89d2797[] = { "/adform-tracking.", NULL };
const char *md89d2a8c[] = { "contentdigital.info^", NULL };
const char *md89d4434[] = { "=160x600;", NULL };
const char *md89d7f2b[] = { "cbiapaofuviswf.com^", NULL };
const char *md89f951e[] = { "gocdkeys.com/images/", "_400x300_", NULL };
const char *md89ff0be[] = { "mhfvtafbraql.com^", NULL };
const char *md8a0437b[] = { "kgkjlivo.com^", NULL };
@ -50947,6 +50965,7 @@ const char *me55bddd2[] = { "awdigit.info^", NULL };
const char *me55e4a30[] = { ".stats?action=", NULL };
const char *me55e6afd[] = { "lazygirls.info/click.php", NULL };
const char *me563a231[] = { "qq.com/kvcollect?", NULL };
const char *me565bf6f[] = { "bohowhepsandked.info^", NULL };
const char *me5680e56[] = { "wlzrvihznn.bid^", NULL };
const char *me56a861f[] = { "advertiseworld.com^", NULL };
const char *me56bb87a[] = { "uzesptwcwwmt.com^", NULL };
@ -51060,6 +51079,7 @@ const char *me5f4d302[] = { "l.fairblocker.com^", NULL };
const char *me5f54c5e[] = { "stat.mtv3.fi^", NULL };
const char *me5f7c635[] = { "affiliate.resellerclub.com^", NULL };
const char *me5f971b7[] = { "makazi.com/tracker-", NULL };
const char *me5fa73a5[] = { "utzhcsrzrlhhxn.com^", NULL };
const char *me5fae0a6[] = { "bektvxxfv.bid^", NULL };
const char *me5fb69b [] = { "yimg.com^", "^billboardv2r5min.js", NULL };
const char *me5fd2f9c[] = { "ads.affiliatecruise.com/redirect.aspx?", NULL };
@ -56532,6 +56552,7 @@ const char *mfc9ba81d[] = { "dressuppink.com^", "^ads.js", NULL };
const char *mfc9e005c[] = { "arclk.net/trax?", NULL };
const char *mfc9f7b8a[] = { "cdtojdrhoc.bid^", NULL };
const char *mfca0387 [] = { "marketo.net^", NULL };
const char *mfca120ef[] = { "curalate.com/api/v1/metrics/", NULL };
const char *mfca1a06d[] = { "vfvbarhywkjsf.com^", NULL };
const char *mfca2c0fc[] = { "amwupsihqfewgr.com^", NULL };
const char *mfca2d626[] = { "summitemarketinganalytics.com^", NULL };
@ -57010,7 +57031,6 @@ const char *mfe8a676f[] = { "googleapis.com/affiliation/", "?key=", NULL };
const char *mfe8a8158[] = { "/ga_header.", NULL };
const char *mfe8b0c4a[] = { "autosport.com/img/promo/", NULL };
const char *mfe8cfea3[] = { "/searchads/", NULL };
const char *mfe8e06ac[] = { "/gng", ".", NULL };
const char *mfe8e0970[] = { "allmyvideos.net/player/ova-jw.swf", NULL };
const char *mfe8e90d8[] = { "sayadcoltd.com^", NULL };
const char *mfe8efbba[] = { "ztyrgxdelngf.com^", NULL };
@ -58126,7 +58146,6 @@ const char *d7269bb9b[] = { "batmanstream.com", "primewire.is", NULL };
const char *d72fa576a[] = { "pocketnow.com", NULL };
const char *d7306fea6[] = { "pornhub.com", "redtube.com", "tube8.com", "youporn.com", NULL };
const char *d736c7a10[] = { "marca.com", NULL };
const char *d73b9487d[] = { "123movies.com", "123unblock.info", "123unblock.xyz", "1337x.st", "1337x.to", "1movies.is", "adsrt.com", "ancient-origins.net", "aniwatcher.com", "c123movies.com", "clicknupload.org", "couchtuner.onl", "couchtuner.rocks", "daclips.in", "datpiff.com", "downloadpirate.com", "dwatchseries.to", "estream.nu", "estream.to", "estream.xyz", "eztv.ag", "eztv.io", "eztv.tf", "eztv.yt", "ffmovies.ru", "fmovies.io", "fmovies.is", "fmovies.taxi", "fmovies.to", "fmovies.today", "fmovies.world", "fullmatchesandshows.com", "gifsis.com", "gomovies.sc", "gomovieshub.is", "gorillavid.in", "gostreams.net", "hdmoza.com", "hdonline.is", "healthline.com", "intoupload.net", "kickass2.ch", "kickass2.st", "kimcartoon.to", "limetorrents.info", "masterkreatif.com", "megaup.net", "monova.org", "monova.to", "movies.is", "movies123.xyz", "moviescouch.co", "moviewatcher.is", "movpod.in", "mrunlock.icu", "mrunlock.pro", "newser.com", "nocensor.icu", "nocensor.pro", "nowwatchtvlive.ws", "onhax.me", "openload.co", "openload.pw", "peggo.tv", "pirateiro.com", "postimg.cc", "prox4you.pw", "prox4you.xyz", "putlocker.ninja", "putlockers.movie", "queenfaucet.website", "seedpeer.me", "sendit.cloud", "skidrowcrack.com", "solarmovie.id", "solarmovie.one", "solarmoviez.ru", "swatchseries.to", "thewatchseries.ac", "tinypic.com", "torlock.com", "torrentdownload.ch", "torrentdownloads.me", "torrentfunk.com", "torrentfunk2.com", "torrentz2.eu", "tubidy.io", "uiz.io", "unblckd.org", "unblockall.org", "unblocked.app", "unblocked.cx", "unblocked.is", "unblocked.llc", "unblocked.lol", "unblocked.pet", "unblocked.si", "unlockproject.icu", "unlockproject.live", "upload.ac", "uploadproper.net", "uplod.cc", "uplod.io", "uplod.ws", "uptobox.com", "userscloud.com", "ustreamix.com", "ustreamyx.com", "vidbull.tv", "vidoza.co", "vidoza.net", "vidup.io", "watchcartoononline.io", "watchseries.sk", "watchsomuch.info", "x1337x.eu", "x1337x.se", "x1337x.ws", "yesmovies.to", "yify-movies.net", "yify.bz", "yifyddl.movie", "yifytorrent.co", "ymovies.tv", "yourbittorrent2.com", "yts.am", "zippyshare.com", NULL };
const char *d73d995c2[] = { "se.no", NULL };
const char *d74080c52[] = { "remix3d.com", NULL };
const char *d741273e3[] = { "everydayhealth.com", NULL };
@ -58301,6 +58320,7 @@ const char *d85d847eb[] = { "casinobonus24.se", NULL };
const char *d85e4eca [] = { "shopsmarter.com", NULL };
const char *d860b49c2[] = { "aleteia.org", NULL };
const char *d86376b86[] = { "primerahora.com", NULL };
const char *d8646db42[] = { "kissanime.ru", NULL };
const char *d8647337e[] = { "cnbc.com", NULL };
const char *d864c35c6[] = { "filatak.com", NULL };
const char *d866106f7[] = { "kisscartoon.se", NULL };
@ -58409,6 +58429,7 @@ const char *d928f08e9[] = { "washingtonmonthly.com", NULL };
const char *d931883e2[] = { "advertisers.dk", NULL };
const char *d93773def[] = { "ogame.org", "ogame.us", NULL };
const char *d93db5a33[] = { "animecrave.com", "bostonherald.com", "deluxemusic.tv", "deluxetelevision.com", "theunlockr.com", "videopoker.com", "weeklyworldnews.com", NULL };
const char *d93ee06d4[] = { "123movies.com", "123unblock.info", "123unblock.xyz", "1337x.st", "1337x.to", "1movies.is", "adsrt.com", "ancient-origins.net", "anitube.cz", "aniwatcher.com", "c123movies.com", "clicknupload.org", "couchtuner.onl", "couchtuner.rocks", "daclips.in", "datpiff.com", "downloadpirate.com", "dwatchseries.to", "estream.nu", "estream.to", "estream.xyz", "eztv.ag", "eztv.io", "eztv.tf", "eztv.yt", "ffmovies.ru", "fmovies.io", "fmovies.is", "fmovies.taxi", "fmovies.to", "fmovies.today", "fmovies.world", "fullmatchesandshows.com", "gifsis.com", "gomovies.sc", "gomovieshub.is", "gorillavid.in", "gostreams.net", "hdmoza.com", "hdonline.is", "healthline.com", "intoupload.net", "kickass2.ch", "kickass2.st", "kimcartoon.to", "limetorrents.info", "masterkreatif.com", "megaup.net", "monova.org", "monova.to", "movies.is", "movies123.xyz", "moviescouch.co", "moviewatcher.is", "movpod.in", "mrunlock.icu", "mrunlock.pro", "newser.com", "nocensor.icu", "nocensor.pro", "nowwatchtvlive.ws", "onhax.me", "openload.co", "openload.pw", "peggo.tv", "pirateiro.com", "postimg.cc", "prox4you.pw", "prox4you.xyz", "putlocker.ninja", "putlockers.movie", "queenfaucet.website", "seedpeer.me", "sendit.cloud", "skidrowcrack.com", "solarmovie.id", "solarmovie.one", "solarmoviez.ru", "swatchseries.to", "thewatchseries.ac", "tinypic.com", "torlock.com", "torrentdownload.ch", "torrentdownloads.me", "torrentfunk.com", "torrentfunk2.com", "torrentz2.eu", "tubidy.io", "uiz.io", "unblckd.org", "unblockall.org", "unblocked.app", "unblocked.cx", "unblocked.is", "unblocked.llc", "unblocked.lol", "unblocked.pet", "unblocked.si", "unlockproject.icu", "unlockproject.live", "upload.ac", "uploadproper.net", "uplod.cc", "uplod.io", "uplod.ws", "uptobox.com", "userscloud.com", "ustreamix.com", "ustreamyx.com", "vidbull.tv", "vidoza.co", "vidoza.net", "vidup.io", "watchcartoononline.io", "watchseries.sk", "watchsomuch.info", "x1337x.eu", "x1337x.se", "x1337x.ws", "yesmovies.to", "yify-movies.net", "yify.bz", "yifyddl.movie", "yifytorrent.co", "ymovies.tv", "yourbittorrent2.com", "yts.am", "zippyshare.com", NULL };
const char *d93f89464[] = { "amazon.com", NULL };
const char *d9404804e[] = { "t-online.de", NULL };
const char *d941b4a40[] = { "fijivillage.com", NULL };
@ -58495,6 +58516,7 @@ const char *d9e4c782a[] = { "yimg.com", NULL };
const char *d9e541337[] = { "boomsbeat.com", "dramastars.com", "enstarz.com", "hngn.com", "itechpost.com", "kpopstarz.com", "latinpost.com", "natureworldnews.com", "parentherald.com", "readysethealth.com", "realtytoday.com", "sciencetimes.com", "sportsworldreport.com", "universityherald.com", "vcpost.com", "youthhealthmag.com", NULL };
const char *d9e6c3c59[] = { "zazzle.co.nz", NULL };
const char *d9f084543[] = { "kanald.com.tr", NULL };
const char *d9f13f9bf[] = { "safebrowsing.google.com", NULL };
const char *d9f47c3e2[] = { "trello.com", NULL };
const char *d9f5738ab[] = { "target.com", NULL };
const char *d9f862896[] = { "veohb.net", NULL };
@ -69529,6 +69551,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{ma8cb5cd3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m2445e98c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m2237fabe, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{me565bf6f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m1966c4c2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mdcc2bde2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m6576edd3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
@ -71942,6 +71965,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{m37391d41, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m79141b42, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mb95b570c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m7aece7f4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{md84ccda, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m31a71b2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m848fba55, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
@ -74883,6 +74907,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{mbe6d3f20, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{ma1e11adb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m722020a9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mb0a16418, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m6c9d6f2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m71ea9a08, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mbedf61b6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
@ -74985,6 +75010,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{m5069f650, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{me28b34eb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m1d3ccd41, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{md89d7f2b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{md2904fd5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{ma7bf2bba, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m486d5cfc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
@ -75194,6 +75220,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{maf8553da, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m1278873d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m143b5000, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{md63e7d8c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m6350fe64, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m76862453, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m9793429d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
@ -75585,6 +75612,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{m27320ed0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m2041206, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m4325bb06, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m9cd704bb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mbb76a255, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mec9af6e6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mecad12e6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
@ -76296,6 +76324,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{mde34afb9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mfdc21f1f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m72e8a52e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mbad3b227, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m5b13c453, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m5c059ec9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mb189e06, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
@ -76647,6 +76676,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{ma869cce7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mc799664d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mdc543d49, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m5cbe82f6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m7c92bf95, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{med60fe91, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m9ab426c2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
@ -77050,6 +77080,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{m42413ebd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mebbe64e0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mb8b726b3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{me5fa73a5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mc892950, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m1f08906a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m6e966818, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
@ -77516,6 +77547,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{m2a381a09, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m1c8cdcef, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mc2313b95, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m4a13e3f7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m20281aed, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m32957358, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m26691775, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
@ -77674,6 +77706,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{m85154454, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m3c0ff4c6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m219646e2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m6c1d8ab7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m85536c81, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mb065e168, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m1c63155c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
@ -91021,6 +91054,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{md71e6ca4, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL},
{m430a6282, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL},
{m9a892f97, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL},
{m83f5998f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL},
{mc53897, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL},
{m981bb1cf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, dc5bf19fa, NULL},
{m184e0bbb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL},
@ -94921,6 +94955,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{md121aee1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, df7a2e878, NULL},
{m5e67d881, ADBLOCK_FLAG_MATCH_DOMAIN, df7a2e878, NULL},
{m2513a91e, ADBLOCK_FLAG_MATCH_DOMAIN, df7a2e878, NULL},
{mb39ab6da, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL},
{me5fb69b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, df7a2e878, NULL},
{m870d679e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, df7a2e878, NULL},
{m8c905ff3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL},
@ -95031,11 +95066,13 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{m80b23fba, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d959bfae2, NULL},
{mc740dc51, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{medc7998e, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m2d066498, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d8646db42, NULL},
{m642cd3ae, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d8646db42, NULL},
{m5dcf0d8d, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d5eb1a16a, NULL},
{m9919b049, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d2f548843, NULL},
{mfec2604f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d2f548843, NULL},
{mfb3250c1, ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, d9b986c9, NULL},
{m1a95c2b4, ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, d73b9487d, NULL},
{m1a95c2b4, ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, d93ee06d4, NULL},
{m3294ddfd, ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d880d643b, NULL},
{md460838d, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, dcc032b5, NULL},
{m165ffe83, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, dcc032b5, NULL},
@ -95439,9 +95476,9 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{m36cd4bd4, 0, dd1a9c2d9, NULL},
{m90926a85, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d17e94649, NULL},
{me919870d, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d6ab5ffd1, NULL},
{mfe8e06ac, ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d39b16ad1, NULL},
{ma8d2a027, ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d39b16ad1, NULL},
{m62f9c3de, ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d39b16ad1, NULL},
{m19bd3694, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL},
{ma58aa8fc, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL},
{m40eddcae, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_FIRST_PARTY | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, dn804482f2},
{m53f1e186, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d96799975, NULL},
{m1a3fa3c5, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, db6a56c4b, NULL},
@ -107363,6 +107400,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{mba85f5a0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mcb667cf6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m56e0f2ca, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m7d382431, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m2d750a04, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m991ad833, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m67994d12, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
@ -111439,6 +111477,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{maf2f5a09, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL},
{m19b6e8b7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{mf03d00a4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL},
{m1fd72d8d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL},
{m9de0b4be, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, dd44c4f47, NULL},
{m12a395e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL},
{mefd6fee5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL},
@ -113427,6 +113466,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{m9867c047, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL},
{m62ee68a7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL},
{m3e64eaf5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL},
{mc60a79f4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL},
{m6613942d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL},
{m29ca85f7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL},
{mb9e02654, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL},
@ -115525,6 +115565,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{mf8f967f, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_HAS_WILDCARD, d3e8b2cd5, NULL},
{mfeb5d475, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_HAS_WILDCARD, d57188e74, NULL},
{ma75c5fa4, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_HAS_WILDCARD, d3e8b2cd5, NULL},
{mba072b06, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_FIRST_PARTY | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL},
{m2e31bc81, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_FIRST_PARTY | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL},
{me084211, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_FIRST_PARTY | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL},
{m74452723, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_FIRST_PARTY | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL},
@ -117159,6 +117200,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = {
{m89fa82e, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, ddf2d2dfd, NULL},
{ma41dd4d4, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, defcdda93, NULL},
{ma22ddf9c, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL},
{m9638f6ef, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d9f13f9bf, NULL},
{mfca120ef, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL},
{mdeb91a55, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},
{m4a8b1322, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, dd5e8d49e, NULL},
{mbe90abbe, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL},

View file

@ -776,7 +776,7 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -442,6 +442,9 @@ static_library("common") {
@@ -446,6 +446,9 @@ static_library("common") {
sources += [
"media/chrome_media_drm_bridge_client.cc",
"media/chrome_media_drm_bridge_client.h",

View file

@ -94,7 +94,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -4063,6 +4063,13 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -4066,6 +4066,13 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
Browse
</message>

View file

@ -53,7 +53,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -3142,6 +3142,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -3145,6 +3145,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<message name="IDS_MENU_PREFERENCES" desc="Menu item for opening browser preferences. [CHAR-LIMIT=27]">
Settings
</message>

View file

@ -184,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -3127,6 +3127,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -3130,6 +3130,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<message name="IDS_MENU_FIND_IN_PAGE" desc="Menu item allowing users to find text within the current page. [CHAR-LIMIT=27]">
Find in page
</message>

View file

@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -3931,6 +3931,12 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -3934,6 +3934,12 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
IMAGE
</message>

View file

@ -85,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
@@ -124,6 +124,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
@@ -125,6 +125,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
// Keys for category-specific preferences (toggle, link, button etc.), dynamically shown.
public static final String THIRD_PARTY_COOKIES_TOGGLE_KEY = "third_party_cookies";
@ -93,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
public static final String NOTIFICATIONS_VIBRATE_TOGGLE_KEY = "notifications_vibrate";
public static final String EXPLAIN_PROTECTED_MEDIA_KEY = "protected_content_learn_more";
private static final String ADD_EXCEPTION_KEY = "add_exception";
@@ -462,6 +463,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
@@ -466,6 +467,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
if (type == SiteSettingsCategory.Type.COOKIES) {
updateThirdPartyCookiesCheckBox();
@ -101,7 +101,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
} else if (type == SiteSettingsCategory.Type.NOTIFICATIONS) {
updateNotificationsVibrateCheckBox();
}
@@ -500,6 +502,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
@@ -504,6 +506,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
int setting = (int) newValue;
prefServiceBridge.setContentSetting(mCategory.getContentSettingsType(), setting);
getInfoForOrigins();
@ -110,7 +110,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
} else if (THIRD_PARTY_COOKIES_TOGGLE_KEY.equals(preference.getKey())) {
prefServiceBridge.setBlockThirdPartyCookiesEnabled(((boolean) newValue));
} else if (NOTIFICATIONS_VIBRATE_TOGGLE_KEY.equals(preference.getKey())) {
@@ -813,6 +817,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
@@ -817,6 +821,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
TriStateSiteSettingsPreference triStateToggle =
(TriStateSiteSettingsPreference) screen.findPreference(TRI_STATE_TOGGLE_KEY);
Preference thirdPartyCookies = screen.findPreference(THIRD_PARTY_COOKIES_TOGGLE_KEY);
@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
Preference notificationsVibrate = screen.findPreference(NOTIFICATIONS_VIBRATE_TOGGLE_KEY);
Preference explainProtectedMediaKey = screen.findPreference(EXPLAIN_PROTECTED_MEDIA_KEY);
PreferenceGroup allowedGroup = (PreferenceGroup) screen.findPreference(ALLOWED_GROUP);
@@ -844,6 +850,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
@@ -848,6 +854,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
if (hideSecondaryToggles) {
screen.removePreference(thirdPartyCookies);
@ -127,13 +127,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
screen.removePreference(notificationsVibrate);
screen.removePreference(explainProtectedMediaKey);
screen.removePreference(allowedGroup);
@@ -854,12 +861,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
@@ -858,14 +865,17 @@ public class SingleCategoryPreferences extends PreferenceFragment
return;
}
- // Configure/hide the third-party cookie toggle, as needed.
+ // Configure/hide the third-party cookie toggle and session-only cookie toggle, as needed.
if (mCategory.showSites(SiteSettingsCategory.Type.COOKIES)) {
// We don't need this toggle in touchless. Refer to crbug/951850.
if (mCategory.showSites(SiteSettingsCategory.Type.COOKIES)
&& !FeatureUtilities.isNoTouchModeEnabled()) {
thirdPartyCookies.setOnPreferenceChangeListener(this);
updateThirdPartyCookiesCheckBox();
+ cookiesSessionOnly.setOnPreferenceChangeListener(this);
@ -144,7 +146,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
}
// Configure/hide the notifications vibrate toggle, as needed.
@@ -966,6 +976,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
@@ -972,6 +982,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
preference -> PrefServiceBridge.getInstance().isBlockThirdPartyCookiesManaged());
}

View file

@ -228,7 +228,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
#include "chrome/grit/generated_resources.h"
#include "components/download/public/common/download_interrupt_reasons.h"
#include "components/download/public/common/download_item.h"
@@ -106,8 +110,10 @@ using content::DownloadManager;
@@ -107,8 +111,10 @@ using content::DownloadManager;
using download::DownloadItem;
using download::DownloadPathReservationTracker;
using download::PathValidationResult;
@ -239,7 +239,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
namespace {
@@ -760,19 +766,19 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() const {
@@ -761,19 +767,19 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() const {
return std::string(chrome::kApplicationClientIDStringForAVScanning);
}
@ -261,7 +261,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
void ChromeDownloadManagerDelegate::NotifyExtensions(
DownloadItem* download,
@@ -1214,13 +1220,17 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
@@ -1216,13 +1222,17 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
#endif

View file

@ -12,7 +12,7 @@ Perform adblock interception in StartJob to address lagging issues
New mechanism for adblocking based on Brave's adblocking hook
Add support for Webview content blocking
---
android_webview/browser/net/aw_network_delegate.cc | 68 ++++
android_webview/browser/net/aw_network_delegate.cc | 71 ++++
android_webview/browser/net/aw_network_delegate.h | 3 +
chrome/android/java/res/menu/custom_tabs_menu.xml | 12 +
chrome/android/java/res/menu/main_menu.xml | 11 +
@ -21,12 +21,12 @@ Add support for Webview content blocking
.../browser/appmenu/AppMenuPropertiesDelegate.java | 38 ++
.../CustomTabAppMenuPropertiesDelegate.java | 2 +
.../java/strings/android_chrome_strings.grd | 11 +
chrome/browser/net/chrome_network_delegate.cc | 83 +++++
chrome/browser/net/chrome_network_delegate.cc | 86 +++++
.../subresource_filter_content_settings_manager.cc | 1 +
net/BUILD.gn | 7 +
net/url_request/adblock_intercept.cc | 389 +++++++++++++++++++++
net/url_request/adblock_intercept.h | 35 ++
14 files changed, 676 insertions(+)
14 files changed, 682 insertions(+)
create mode 100644 net/url_request/adblock_intercept.cc
create mode 100644 net/url_request/adblock_intercept.h
@ -45,7 +45,7 @@ diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webvie
namespace android_webview {
@@ -49,6 +51,72 @@ AwNetworkDelegate::AwNetworkDelegate() {}
@@ -49,6 +51,75 @@ AwNetworkDelegate::AwNetworkDelegate() {}
AwNetworkDelegate::~AwNetworkDelegate() {
}
@ -56,7 +56,9 @@ diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webvie
+static bool requestIntercepted(net::URLRequest* request, GURL* new_url) {
+ bool block = false, isValidUrl;
+
+ isValidUrl = request->url().is_valid();
+ // skip invalid URLs and browser-initiated requests (which have no initiator)
+ auto initiator = request->initiator();
+ isValidUrl = request->url().is_valid() && initiator.has_value();
+ std::string scheme = request->url().scheme();
+ if (isValidUrl && scheme.length()) {
+ std::transform(scheme.begin(), scheme.end(), scheme.begin(), ::tolower);
@ -64,7 +66,10 @@ diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webvie
+ isValidUrl = false;
+ }
+ }
+ ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
+ ResourceRequestInfo* info;
+ if (isValidUrl) {
+ info = ResourceRequestInfo::ForRequest(request);
+ }
+
+ // there are no per-site nor global ad/content settings when using the SystemWebView
+ bool adblock_enabled = true;
@ -73,9 +78,7 @@ diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webvie
+
+ if (adblock_enabled
+ && content::ResourceType::kMainFrame != resource_type
+ && net::adblock_intercept(request->url(),
+ request->initiator()->host(),
+ resource_type)) {
+ && net::adblock_intercept(request->url(), initiator->host(), resource_type)) {
+ block = true;
+ }
+
@ -280,7 +283,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -3147,6 +3147,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -3150,6 +3150,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<message name="IDS_MENU_REQUEST_DESKTOP_SITE_OFF" desc="Accessibility description for when Request Desktop Site is disabled.">
Turn on Request desktop site
</message>
@ -317,7 +320,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
#endif
#if defined(OS_CHROMEOS)
@@ -193,10 +195,91 @@ void ChromeNetworkDelegate::set_cookie_settings(
@@ -193,10 +195,94 @@ void ChromeNetworkDelegate::set_cookie_settings(
cookie_settings_ = cookie_settings;
}
@ -328,7 +331,9 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
+static bool requestIntercepted(net::URLRequest* request, GURL* new_url) {
+ bool block = false, isValidUrl;
+
+ isValidUrl = request->url().is_valid();
+ // skip invalid URLs and browser-initiated requests (which have no initiator)
+ auto initiator = request->initiator();
+ isValidUrl = request->url().is_valid() && initiator.has_value();
+ std::string scheme = request->url().scheme();
+ if (isValidUrl && scheme.length()) {
+ std::transform(scheme.begin(), scheme.end(), scheme.begin(), ::tolower);
@ -336,7 +341,10 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
+ isValidUrl = false;
+ }
+ }
+ ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
+ ResourceRequestInfo* info;
+ if (isValidUrl) {
+ info = ResourceRequestInfo::ForRequest(request);
+ }
+
+ bool adblock_enabled = false;
+ if (isValidUrl && info) {
@ -363,9 +371,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
+
+ if (adblock_enabled
+ && content::ResourceType::kMainFrame != resource_type
+ && net::adblock_intercept(request->url(),
+ request->initiator()->host(),
+ resource_type)) {
+ && net::adblock_intercept(request->url(), initiator->host(), resource_type)) {
+ block = true;
+ }
+

View file

@ -9,7 +9,7 @@ Subject: Disable seed-based field trials
diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc
--- a/components/variations/service/variations_field_trial_creator.cc
+++ b/components/variations/service/variations_field_trial_creator.cc
@@ -512,8 +512,10 @@ bool VariationsFieldTrialCreator::SetupFieldTrials(
@@ -536,8 +536,10 @@ bool VariationsFieldTrialCreator::SetupFieldTrials(
#endif // BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
bool used_seed = false;
if (!used_testing_config) {

View file

@ -28,7 +28,7 @@ Fixup more permission removal
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -1042,8 +1042,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
@@ -1060,8 +1060,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
resources = [
"java/res_template/xml/file_paths.xml",
"java/res_template/xml/launchershortcuts.xml",
@ -38,7 +38,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
]
res_dir = "java/res_template"
variables = [ "manifest_package=$manifest_package" ]
@@ -1054,7 +1053,6 @@ jinja_template_resources("chrome_test_apk_template_resources") {
@@ -1072,7 +1071,6 @@ jinja_template_resources("chrome_test_apk_template_resources") {
"java/res_template/xml/file_paths.xml",
"java/res_template/xml/launchershortcuts.xml",
"java/res_template/xml/searchable.xml",

View file

@ -156,7 +156,7 @@ diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
@@ -38,7 +38,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
@@ -39,7 +39,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
// are defined in the SiteSettingsCategory, additional keys
// are listed here.
static final String MEDIA_KEY = "media";
@ -164,7 +164,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
// Whether the Protected Content menu is available for display.
boolean mProtectedContentMenuAvailable;
@@ -82,11 +81,10 @@ public class SiteSettingsPreferences extends PreferenceFragment
@@ -83,11 +82,10 @@ public class SiteSettingsPreferences extends PreferenceFragment
// The Media sub-menu only contains Protected Content and Autoplay, so remove all other
// menus.
for (@Type int i = 0; i < Type.NUM_ENTRIES; i++) {
@ -177,7 +177,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
} else {
// If both Autoplay and Protected Content menus are available, they'll be tucked under
// the Media key. Otherwise, we can remove the Media menu entry.
@@ -102,11 +100,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
@@ -103,11 +101,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
if (!SiteSettingsCategory.adsCategoryEnabled()) {
getPreferenceScreen().removePreference(findPreference(Type.ADS));
}
@ -189,7 +189,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
if (!ChromeFeatureList.isEnabled(ChromeFeatureList.SENSOR_CONTENT_SETTING)) {
getPreferenceScreen().removePreference(findPreference(Type.SENSORS));
}
@@ -116,10 +109,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
@@ -121,10 +114,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
private void updatePreferenceStates() {
PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
@ -200,16 +200,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
// Preferences that navigate to Website Settings.
List<Integer> websitePrefs = new ArrayList<Integer>();
if (mMediaSubMenu) {
@@ -136,7 +125,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
@@ -141,7 +130,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
if (!mProtectedContentMenuAvailable) {
websitePrefs.add(Type.AUTOPLAY);
}
- websitePrefs.add(Type.BACKGROUND_SYNC);
+// websitePrefs.add(Type.BACKGROUND_SYNC);
websitePrefs.add(Type.CAMERA);
websitePrefs.add(Type.CLIPBOARD);
websitePrefs.add(Type.COOKIES);
@@ -232,11 +221,4 @@ public class SiteSettingsPreferences extends PreferenceFragment
if (!FeatureUtilities.isNoTouchModeEnabled()) {
websitePrefs.add(Type.CLIPBOARD);
@@ -239,11 +228,4 @@ public class SiteSettingsPreferences extends PreferenceFragment
preference.getTitle().toString());
return false;
}

View file

@ -107,7 +107,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"target_sdk_version=$android_sdk_version",
]
}
@@ -1831,7 +1831,7 @@ jinja_template("chrome_public_test_apk_manifest") {
@@ -1849,7 +1849,7 @@ jinja_template("chrome_public_test_apk_manifest") {
variables = default_chrome_public_jinja_variables
variables += [
"manifest_package=$test_manifest_package",
@ -116,7 +116,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"target_sdk_version=$android_sdk_version",
]
}
@@ -1842,7 +1842,7 @@ jinja_template("chrome_public_test_vr_apk_manifest") {
@@ -1860,7 +1860,7 @@ jinja_template("chrome_public_test_vr_apk_manifest") {
output = chrome_public_test_vr_apk_manifest
variables = chrome_public_jinja_variables
variables += [

View file

@ -309,7 +309,7 @@ diff --git a/chrome/browser/component_updater/file_type_policies_component_insta
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -319,13 +319,6 @@ ChromeDownloadManagerDelegate::~ChromeDownloadManagerDelegate() {
@@ -320,13 +320,6 @@ ChromeDownloadManagerDelegate::~ChromeDownloadManagerDelegate() {
void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
download_manager_ = dm;
@ -323,7 +323,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
}
#if defined(OS_ANDROID)
@@ -636,16 +629,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath(
@@ -637,16 +630,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath(
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename) {