From 9eca1ff0b3367473ccfb4a714889c254b98c04a2 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Fri, 1 Jun 2018 15:58:52 +0200 Subject: [PATCH] Release 67.0.3396.67 --- CHANGELOG.md | 3 + filters/adblock_entries.h | 65 +++++++- ...sable-the-ad-promo-system-by-default.patch | 27 ---- ...sable-third-party-cookies-by-default.patch | 2 +- ...mo-disable-Google-promotion-fetching.patch | 4 +- .../BRM010_Modify-default-preferences.patch | 16 +- ...11_Do-not-store-passwords-by-default.patch | 2 +- .../BRM014_Disable-WebRTC-by-default.patch | 2 +- ...RM016_Skip-the-first-run-and-metrics.patch | 2 +- .../BRM017_Disable-Omaha-update-checks.patch | 2 +- ...en-accessing-page-info-site-settings.patch | 2 +- ...AMP-and-tracking-from-search-results.patch | 59 ++++---- .../BRM025_Play-videos-in-background.patch | 50 +++---- ...28_ungoogled-chromium-Disable-signin.patch | 10 +- ...ed-chromium-Disable-untraceable-URLs.patch | 34 ++--- ...m-Disable-intranet-redirect-detector.patch | 6 +- ...romium-Disable-Google-host-detection.patch | 21 +-- ...M036_ungoogled-chromium-Disable-Gaia.patch | 6 +- ...-chromium-Clear-HTTP-cache-menu-item.patch | 18 +-- ...38_url_request-hooks-and-ad-url-data.patch | 6 +- patches/BRM039_Bromite-adblock-engine.patch | 12 +- .../BRM041_Battery-API-return-nothing.patch | 8 +- .../BRM042_Disable-plugins-enumeration.patch | 10 +- ...e-fingerprinting-mitigations-via-IDL.patch | 24 +-- ...-toggle-global-Javascript-preference.patch | 12 +- ...-account-access-permission-on-reboot.patch | 6 +- ...046_Punt-the-Widevine-version-string.patch | 24 +-- ...7_Disable-metrics-on-all-I-O-threads.patch | 2 +- ...getClientRects-getBoundingClientRect.patch | 52 +++---- ...s-fingerprinting-mitigations-via-IDL.patch | 24 +-- ...Started-work-on-canvas-randomisation.patch | 140 +++++++++--------- ...um-connections-per-host-from-6-to-15.patch | 23 --- 32 files changed, 335 insertions(+), 339 deletions(-) delete mode 100644 patches/BRM000_Disable-the-ad-promo-system-by-default.patch delete mode 100644 patches/BRM053_Increase-maximum-connections-per-host-from-6-to-15.patch diff --git a/CHANGELOG.md b/CHANGELOG.md index bbfcae9d..0decba03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 67.0.3396.67 +* updated AdBlock filters + # 66.0.3359.202 * fix DevTools integration (https://github.com/bromite/bromite/issues/23) * allow toggling of Javascript from New Tab Page (fixes https://github.com/bromite/bromite/issues/60) diff --git a/filters/adblock_entries.h b/filters/adblock_entries.h index 595ba094..2e1e7553 100644 --- a/filters/adblock_entries.h +++ b/filters/adblock_entries.h @@ -19,7 +19,7 @@ struct adblock_entry { const char **domains, **domains_neg; }; -#define ADBLOCK_ENTRY_COUNT 51122 +#define ADBLOCK_ENTRY_COUNT 51150 const char *m10030a28[] = { "/InsightTrk/", NULL }; const char *m10045299[] = { "award.sitekeuring.net^", NULL }; const char *m100458cd[] = { "eluhhfyxx.com^", NULL }; @@ -732,6 +732,7 @@ const char *m1363bba3[] = { "/ad_right_", NULL }; const char *m1364bee0[] = { "instapage.com^", NULL }; const char *m13659885[] = { "mttyfwtvyumc.com^", NULL }; const char *m1365e1a7[] = { "/internetad/", NULL }; +const char *m136a6ace[] = { "qlvgvehwzj.com^", NULL }; const char *m136e4ebf[] = { "klnrew.site^", NULL }; const char *m1370a421[] = { "/bannercode.php", NULL }; const char *m13710fe3[] = { "d2anfhdgjxf8s1.cloudfront.net/ajs.php?adserver=", NULL }; @@ -1132,6 +1133,7 @@ const char *m157eea68[] = { "1ad6aa86d7f79a66d4.com^", NULL }; const char *m15819158[] = { "basicstat.com^", NULL }; const char *m15828fa [] = { "d2focgxak1cn74.cloudfront.net^", NULL }; const char *m15831370[] = { "_468_80_", NULL }; +const char *m1583e6cf[] = { "phpbb.com^", "^images^bg_forumatic_front_page.png", NULL }; const char *m15843181[] = { "9b13c1c151f9664a73.com^", NULL }; const char *m158820eb[] = { "da5w2k479hyx2.cloudfront.net^", NULL }; const char *m15886a0c[] = { "adprofile.net^", NULL }; @@ -7519,6 +7521,7 @@ const char *m33df94cf[] = { "/native-advertising/", NULL }; const char *m33df9b97[] = { "laliga.es/img/patrocinadores-", NULL }; const char *m33dff460[] = { "/insitemetrics/", NULL }; const char *m33e1fa46[] = { "ad4.liverail.com/?compressed", NULL }; +const char *m33e231b6[] = { "ydxeryetxyij.com^", NULL }; const char *m33e376d0[] = { "dgmatix.com^", NULL }; const char *m33e4eddc[] = { "siwbori.info^", NULL }; const char *m33e7782f[] = { "hlserve.com^", NULL }; @@ -7801,6 +7804,7 @@ const char *m351e3790[] = { "/iframe_ad.", NULL }; const char *m351ea630[] = { "uptobox.com", ".ad6media", NULL }; const char *m35213b7 [] = { "^mod^wms^do^view_", "^zone^", NULL }; const char *m3522dcb3[] = { "phncdn.com/assets/", "/js/user_notification.js", NULL }; +const char *m35273de3[] = { "wzafekkdp.com^", NULL }; const char *m352a7351[] = { "angorch-cdr7.com^", NULL }; const char *m352ab81c[] = { "ads.wapx.cn^", NULL }; const char *m352b900f[] = { "union.360.cn/1899.js", NULL }; @@ -9951,6 +9955,7 @@ const char *m3faf68a4[] = { "doubleclick.net/pfadx/", ".mtvi", NULL }; const char *m3faf7164[] = { "/footer_ad_", NULL }; const char *m3fb0593 [] = { "rapidvideo.tv/images/pl.jpg", NULL }; const char *m3fb1332c[] = { "webtuna.com^", NULL }; +const char *m3fb34f2a[] = { "beacons.mediamelon.com^", NULL }; const char *m3fb47047[] = { "ad.services.distractify.com^", NULL }; const char *m3fb6c61a[] = { "/ad160.", NULL }; const char *m3fbe8e04[] = { "cliksolution.com^", NULL }; @@ -10514,6 +10519,7 @@ const char *m426ffee3[] = { "webprospector.de^", NULL }; const char *m427040a5[] = { "yfkwqoswbghk.com^", NULL }; const char *m427061ea[] = { "batmanstream.com/", ".html?", NULL }; const char *m42718e06[] = { "dramatical.online^", NULL }; +const char *m42754c9d[] = { "kdhkjeklzihiwh.com^", NULL }; const char *m427593d5[] = { "dcdn.lt/adbam/", NULL }; const char *m427604dc[] = { "interceptum.com^", NULL }; const char *m4276e740[] = { "?ZoneID=", "&SiteID=", "&PageID=", NULL }; @@ -10526,6 +10532,7 @@ const char *m427ecb2d[] = { "blankfire.com^", "_.gif", NULL }; const char *m427f1239[] = { "classifieds.wsj.com/ad/", NULL }; const char *m4281dc15[] = { "bostonwall.com^", NULL }; const char *m4282b67e[] = { "klikvip.com^", NULL }; +const char *m4285afa5[] = { "tw.cx^", NULL }; const char *m42866fc [] = { "prwlzpyschwi.com^", NULL }; const char *m42877698[] = { "/js/counter.js?", NULL }; const char *m428d258f[] = { "dumedia.ru^", NULL }; @@ -10665,7 +10672,6 @@ const char *m431cf9c5[] = { "ilsivrexvpyv.com^", NULL }; const char *m431e036e[] = { "/txtAd1.", NULL }; const char *m431e5e81[] = { "advert.ee^", NULL }; const char *m431ebe4b[] = { "mrycrypto.com^", NULL }; -const char *m431f5f53[] = { "phpbb.com/theme/images/hosting/hostmonster-downloads.gif", NULL }; const char *m4320b434[] = { "exoclickz.com^", NULL }; const char *m43216d01[] = { "/img.mqcdn.com/a/a", NULL }; const char *m4321d916[] = { "homeschoolmath.net/a/", NULL }; @@ -12055,6 +12061,7 @@ const char *m49da9886[] = { "/utag.loader.", NULL }; const char *m49db30b9[] = { "/xclicks.", NULL }; const char *m49dca577[] = { "myfreakygf.com/www/click/", NULL }; const char *m49de634c[] = { "adultfyi.com/images/banners/", NULL }; +const char *m49dfb920[] = { "sheego.de/ar/", NULL }; const char *m49e00a35[] = { "cloudfront.net/vis_opt_no_jquery.js", NULL }; const char *m49e6494e[] = { "constructionreviewonline.com^", "banner", NULL }; const char *m49e6b416[] = { "sngjaetjozyr.com^", NULL }; @@ -12935,6 +12942,7 @@ const char *m4e2e21f2[] = { "kupona.de^", NULL }; const char *m4e2e9850[] = { "adudzlhdjgof.com^", NULL }; const char *m4e2ff935[] = { "dkdwv3lcby5zi.cloudfront.net^", NULL }; const char *m4e2ffe44[] = { "pro-advertising.com^", NULL }; +const char *m4e319ef8[] = { "gogergyxl.com^", NULL }; const char *m4e328ee7[] = { "/adserv|", "|adtech;", NULL }; const char *m4e339d8b[] = { "nnzkabsgmfjn.bid^", NULL }; const char *m4e34d4a1[] = { "imagesnake.com/includes/js/pops.js", NULL }; @@ -13581,6 +13589,7 @@ const char *m51685b06[] = { "counters4u.com^", NULL }; const char *m5168aa2a[] = { "l.yimg.com/ao/i/ad/", NULL }; const char *m516948f2[] = { "/ad/login-", NULL }; const char *m516a97d5[] = { "s997tc81.loan^", NULL }; +const char *m516d4ec4[] = { "izelshnkrh.com^", NULL }; const char *m516fca1d[] = { "kdowqlpt.info^", NULL }; const char *m51704d3d[] = { "polymorphicads.jp^", NULL }; const char *m5170a13 [] = { "baxter.com/includes/wtss.js", NULL }; @@ -14506,6 +14515,7 @@ const char *m558b16e9[] = { "wildxtraffic.com^", NULL }; const char *m558b88e3[] = { "starffa.com^", NULL }; const char *m558c42b9[] = { "/YuduStatistics/", NULL }; const char *m558d49e5[] = { "adscale.de^", NULL }; +const char *m558e2f79[] = { "ejjgrmutgrdwxg.com^", NULL }; const char *m5595292c[] = { "tag-abe.cartrawler.com^", NULL }; const char *m5595c76b[] = { "cgi.tbs.co.jp^", NULL }; const char *m55974d18[] = { "/ads-05.", NULL }; @@ -18271,6 +18281,7 @@ const char *m67834982[] = { "/jsfiles/ads/", NULL }; const char *m67842123[] = { "huffingtonpost.com/_uac/adpage.html", NULL }; const char *m6785c43e[] = { "/promo_tracking/", NULL }; const char *m67869608[] = { "_pix.gif?", NULL }; +const char *m6786cd98[] = { "/i?stm=", "&cookie=", NULL }; const char *m678764b5[] = { "qshsaocjet.com^", NULL }; const char *m678773aa[] = { "bc.geocities.", "/not_found/", NULL }; const char *m678bf782[] = { "/banner_db.php?", NULL }; @@ -18549,6 +18560,7 @@ const char *m68d04dea[] = { "cmstool.youku.com^", NULL }; const char *m68d18f44[] = { "nephritish.com^", NULL }; const char *m68d2aaca[] = { "pxlijblevbp.bid^", NULL }; const char *m68d40fa4[] = { "webonlinnew.com^", NULL }; +const char *m68d41383[] = { "search.stream.cr/cdn-cgi/apps/head/", NULL }; const char *m68d51f53[] = { "monstertube.com/images/access_", NULL }; const char *m68d71cba[] = { "bdwblog.eastmoney.com^", NULL }; const char *m68d780f4[] = { "databrain.com^", NULL }; @@ -19452,6 +19464,7 @@ const char *m6d111ed6[] = { "yelp.com/spice?", NULL }; const char *m6d1145d4[] = { "/imagesadspro/", NULL }; const char *m6d12ffad[] = { "/PointRoll.", NULL }; const char *m6d163f3d[] = { "adspsp.com^", NULL }; +const char *m6d16446 [] = { "wtixtgqyztdc.com^", NULL }; const char *m6d16fdf6[] = { "&ad_type_", NULL }; const char *m6d178b07[] = { "arpuonline.com^", NULL }; const char *m6d17c33c[] = { "/468x80.", NULL }; @@ -20892,6 +20905,7 @@ const char *m73d8dd0 [] = { "stat.uuu9.com^", NULL }; const char *m73d9bca3[] = { "d3irruagotonpp.cloudfront.net^", NULL }; const char *m73db7987[] = { "blamads-assets.s3.amazonaws.com^", NULL }; const char *m73dd5963[] = { "collective-media.net^", NULL }; +const char *m73df55ac[] = { "togfcqfvarpq.com^", NULL }; const char *m73dff3fe[] = { "d3iouejux1os58.cloudfront.net^", NULL }; const char *m73e0ba9f[] = { "/friendbuy.min.js", NULL }; const char *m73e1fc41[] = { "spklw.com^", NULL }; @@ -22520,6 +22534,7 @@ const char *m7ba73655[] = { "i.i.com.com/cnwk.1d/", "/tt_post_dl.jpg", NULL }; const char *m7ba9321 [] = { "/rcom-ads-", NULL }; const char *m7baa0dd9[] = { "core.queerclick.com^", NULL }; const char *m7babebb6[] = { "/blog_ads/", NULL }; +const char *m7bacd834[] = { "ckjjnujgvfd.com^", NULL }; const char *m7bb01084[] = { "admeta.vo.llnwd.net^", NULL }; const char *m7bb063a6[] = { "magicads.nl^", NULL }; const char *m7bb34a4d[] = { "wvutzxicvmgljw.bid^", NULL }; @@ -24824,6 +24839,7 @@ const char *m86d2aa4 [] = { "andyhoppe.com^", NULL }; const char *m86d53525[] = { "esus.com/images/regiochat_logo.png", NULL }; const char *m86d63402[] = { "/advs-instream.", NULL }; const char *m86db9ac8[] = { "mkfumtmi.bid^", NULL }; +const char *m86dd0dd7[] = { "tracking.epicgames.com^", NULL }; const char *m86df3dc6[] = { "npttech.com/advertising.js", NULL }; const char *m86df7f47[] = { "/pub/ads/", NULL }; const char *m86e1e3aa[] = { "/wlexpert_tracker.", NULL }; @@ -24929,6 +24945,7 @@ const char *m87650dc8[] = { "killerstartups.com^", "^adsensev", NULL }; const char *m87658042[] = { "/Log?entry=", NULL }; const char *m8765d3fc[] = { "247-inc.net^", NULL }; const char *m8767979b[] = { "/mixpanel-measurement.", NULL }; +const char *m87680448[] = { "lkdlamrwl.com^", NULL }; const char *m87686d36[] = { "ixbccovgriz.bid^", NULL }; const char *m8769ca83[] = { "fqjevuoat.com^", NULL }; const char *m8769f6df[] = { "gridsumdissector.com^", NULL }; @@ -25253,6 +25270,7 @@ const char *m890a8853[] = { "epxxqzrcdfkxo.bid^", NULL }; const char *m890f4c4f[] = { "zyqlfplqdgxu.com^", NULL }; const char *m8910270e[] = { "/adbrite_", NULL }; const char *m8910ba54[] = { "/getad/", NULL }; +const char *m89129dd8[] = { "oazznjmbchmpdg.com^", NULL }; const char *m89135432[] = { "uyfudwfqfk.bid^", NULL }; const char *m8915af [] = { "anet", ".tradedoubler.com^", NULL }; const char *m891698af[] = { "-adverts.min.", NULL }; @@ -25460,6 +25478,7 @@ const char *m89f86e67[] = { ",970x90;", NULL }; const char *m89f97cf4[] = { "northjersey.com^", "_Sponsor.", NULL }; const char *m89fa0957[] = { "dropbox.com/el/?b=open:", NULL }; const char *m89fa7526[] = { "24counter.com^", NULL }; +const char *m89fd2fa2[] = { "phpbb.com^", "^images^hosting^hostmonster-downloads.gif", NULL }; const char *m89fd6b3 [] = { "kwyxncikkzz.bid^", NULL }; const char *m89fdad64[] = { ".php?adv=", NULL }; const char *m8a00895f[] = { "vmweb.net/identity.min.js", NULL }; @@ -25484,6 +25503,7 @@ const char *m8a1285b8[] = { "capitalfm.co.ke^", "^830x460-iv.jpg", NULL }; const char *m8a152425[] = { "doubleclick.net/N2/pfadx/video.marketwatch.com/", NULL }; const char *m8a167fae[] = { "/vendemologserver-", NULL }; const char *m8a16ceee[] = { "xomreviews.com/sponsors/", NULL }; +const char *m8a1a8da8[] = { "fnayazchhum.com^", NULL }; const char *m8a1c10ed[] = { "74da0fffc981.com^", NULL }; const char *m8a1c1b85[] = { "/adtooltip/", NULL }; const char *m8a1cf784[] = { "/adsrule.", NULL }; @@ -28099,6 +28119,7 @@ const char *m96ffd93 [] = { "smartad.ee^", NULL }; const char *m9700317d[] = { "mediadvertising.ro^", NULL }; const char *m9701f76f[] = { "/ad_title_", NULL }; const char *m970306e6[] = { "analytics.infobae.com^", NULL }; +const char *m97035fe8[] = { "d2cgumzzqhgmdu.cloudfront.net^", NULL }; const char *m9703d76a[] = { "wordc.ga^", NULL }; const char *m9706fd95[] = { "amazing-offers.co.il^", NULL }; const char *m9707598 [] = { "/track?", "&ref=", NULL }; @@ -34090,7 +34111,6 @@ const char *mb3939ee5[] = { "epgooipixbbo.com^", NULL }; const char *mb395080 [] = { "aaqpajztftqw.com^", NULL }; const char *mb3961f8e[] = { "_middle_ads.", NULL }; const char *mb3967c07[] = { "mdn2015x2.com^", NULL }; -const char *mb3987299[] = { "phpbb.com/theme/images/bg_forumatic_front_page.png", NULL }; const char *mb39a44 [] = { "oewa.at^", NULL }; const char *mb39abe0a[] = { "/misc/ads/", NULL }; const char *mb39db89b[] = { "rutube.ru/counters.html?", NULL }; @@ -39977,6 +39997,7 @@ const char *mcfbb6b7c[] = { "dimml.io^", NULL }; const char *mcfbbc18d[] = { "tracker.euroweb.net^", NULL }; const char *mcfbcab99[] = { "rcqyocxmmkais.bid^", NULL }; const char *mcfbdbce2[] = { "possibleboats.com^", NULL }; +const char *mcfbf1952[] = { "search.stream.cr/sw.js", NULL }; const char *mcfc0e622[] = { "62ad28a28030eb4fed3.site^", NULL }; const char *mcfc11c44[] = { "yimg.com/cv/", "/config-object-html5billboardfloatexp.js", NULL }; const char *mcfc3fd3e[] = { "affiliates.rozetka.com.ua^", NULL }; @@ -40389,6 +40410,7 @@ const char *md1c053c7[] = { "wqlkp.com^", NULL }; const char *md1c2c29f[] = { "aclsqdpgeaik.com^", NULL }; const char *md1c2d9 [] = { "vwygasjfv.bid^", NULL }; const char *md1c2eff3[] = { "imgrock.co/js/jquery", ".js", NULL }; +const char *md1c3432d[] = { "hquijlndtd.com^", NULL }; const char *md1c42f19[] = { "thepreparednessreview.com/wp-content/uploads/", "_185x185.jpg", NULL }; const char *md1c54414[] = { "usaupload.net/ads.js", NULL }; const char *md1c7d7e0[] = { "/adsfinal.", NULL }; @@ -43331,6 +43353,7 @@ const char *mdfba35c7[] = { "geoip.taskforce.is^", NULL }; const char *mdfbb73be[] = { "browsealoud.com/plus/scripts/", NULL }; const char *mdfbe819b[] = { "/webstats.php", NULL }; const char *mdfbf7bcb[] = { "milkmanbook.com/dat/promo/", NULL }; +const char *mdfbf83d [] = { "hkvqyjtdghbe.com^", NULL }; const char *mdfc24d08[] = { "gamersconnexion.com/js/advert.js", NULL }; const char *mdfc3f2d5[] = { "pkqbgjuinhgpizxifssrtqsyxnzjxwozacnxsrxnvkrokysnhb.com^", NULL }; const char *mdfc62859[] = { "thisiswaldo.com^", NULL }; @@ -43906,6 +43929,7 @@ const char *me2766097[] = { "/special_ads/", NULL }; const char *me276d739[] = { "adclick.pk^", NULL }; const char *me276f50f[] = { "rainwealth.com^", NULL }; const char *me2788d2a[] = { "tweightment.pro^", NULL }; +const char *me278c339[] = { "kshysnypina.com^", NULL }; const char *me27e8cb9[] = { "gerwen.info^", NULL }; const char *me27fd1d5[] = { "gameorc.net/a.html", NULL }; const char *me28113ff[] = { "gamersbanner.com^", NULL }; @@ -44290,6 +44314,7 @@ const char *me455dc24[] = { "hivps.xyz^", NULL }; const char *me4584440[] = { "dc63bfb069ea522f.com^", NULL }; const char *me459e8ae[] = { "/ad-updated-", NULL }; const char *me45a32b [] = { "ezmob.com^", NULL }; +const char *me45ca6c2[] = { "ljpuptlitl.com^", NULL }; const char *me45d3097[] = { "doubleclick.net/pfadx/", ".reuters/", NULL }; const char *me45ef43e[] = { "cywegkfcrhup.com^", NULL }; const char *me4636f8 [] = { "u.tv/images/sponsors/", NULL }; @@ -45855,6 +45880,7 @@ const char *mec08bb83[] = { "yfmghana.com/images/banners/", NULL }; const char *mec0b131e[] = { "wstatslive.com^", NULL }; const char *mec0eb503[] = { "huffingtonpost.com/traffic/", NULL }; const char *mec0f63da[] = { "cjprndsozzdu.bid^", NULL }; +const char *mec120ac [] = { "dw.com/tracking/", NULL }; const char *mec12f8ac[] = { "ovzmelkxgtgf.com^", NULL }; const char *mec1381fd[] = { "acecounter.com^", NULL }; const char *mec13c862[] = { "/addefend/", NULL }; @@ -46813,6 +46839,7 @@ const char *mf0a23874[] = { "incentivetravel.co.uk/images/banners/", NULL }; const char *mf0a37178[] = { "t8cdn.com/assets/pc/js/", NULL }; const char *mf0a82bbd[] = { "/adspi.", NULL }; const char *mf0a851cc[] = { "presetrabbits.com^", NULL }; +const char *mf0ab0c85[] = { "/tracking/xtcore.", NULL }; const char *mf0ac2ace[] = { "/stats?callback=", NULL }; const char *mf0ad2ab9[] = { "adnet.mennonite.net^", NULL }; const char *mf0adda34[] = { "supply.upjers.com^", NULL }; @@ -62704,6 +62731,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m9e680cfd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m4295b737, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m44135f71, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m99c6a6d0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5b4597a2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9f25f0c5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m50050d21, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -66379,6 +66407,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb86b7ef3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m18bcdc02, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md1fb09fd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m7bacd834, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m20b549c6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m12819607, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m2edb76fe, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -66848,6 +66877,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mddebfe00, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5183d912, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m19f8f396, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m558e2f79, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md71c7ea4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m3f766994, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md2fca7fe, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67121,6 +67151,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m9a6e841, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5952f85f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m345539f0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m8a1a8da8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6556e841, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8a9e676a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m404e76b6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67375,6 +67406,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m6845fbc7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m20b46cdb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md579059d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m4e319ef8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m4c7ca8e6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mdcfcb735, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mdaf9dedd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67600,6 +67632,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m4be8c4c3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1bda334b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6cb3fa26, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mdfbf83d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m3cfc284f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m705114a9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m68a4498c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67659,6 +67692,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mde381725, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m92755d48, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m293e2a5c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {md1c3432d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6ff0d1d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m74802a08, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md2a2fa7a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67980,6 +68014,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mca041f81, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {ma1621707, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m36bfd881, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m516d4ec4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc7bb2241, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mebee74bc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mdc3de59a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -68286,6 +68321,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m8c78d03b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m36961048, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mf292e1a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m42754c9d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6cc4a26d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1066d076, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m7a38f565, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -68424,6 +68460,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m35affeb6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m3c8385ab, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {ma3ce74aa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {me278c339, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m7899d806, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mf67e23ce, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m2b2f4946, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -68612,12 +68649,14 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m42535af7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m42edbd4a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1519f1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {me45ca6c2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5f2d22e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc955df59, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {ma67c10f2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8532fd3b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m82e4fe00, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m55fa869a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m87680448, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md5bffed2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mb38888c5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9b63ca7e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -69294,6 +69333,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m4a70f06d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m7bd407a6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1996fccd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m89129dd8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mf5155b10, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mbf5c2c73, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mdec62609, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -69873,6 +69913,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {me379bf4f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mbed6a8a5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mae040837, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m136a6ace, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m45cf36c8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m3be67c77, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m802a962c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -70623,6 +70664,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m49d29b55, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m3034d39b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6e0b1e56, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m73df55ac, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m513a2d56, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mb52839a5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5dfa4af, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -71421,6 +71463,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mc682cca5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md9ae36e7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc75f7bed, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m6d16446, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {med232e37, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m708f5395, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m40c13c0e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -71471,6 +71514,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m2054ae92, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8564b537, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc1f2b9ab, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m35273de3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m237796e9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m924deefd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me9a61470, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -71740,6 +71784,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m80c169c1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m849b9993, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mb9260849, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m33e231b6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5491fc7e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mf2fa2123, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc4bda485, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -74917,6 +74962,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m3a962440, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m9053839d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mc09e696f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m97035fe8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m7b4d160b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m291e021, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m95a08153, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -79477,8 +79523,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb7b695c3, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m64013bbd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m49949174, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {mb3987299, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {m431f5f53, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {m1583e6cf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m89fd2fa2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m8ec8704c, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m8704148b, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m73c27c0c, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -86009,7 +86055,9 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m6dee762b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {m39d55769, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mff7910d0, ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, + {m68d41383, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m94c8af00, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {mcfbf1952, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mf53eefe4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m542d02f7, ADBLOCK_FLAG_EXCEPTION, dc072a5cb, NULL }, {m3023b811, ADBLOCK_FLAG_EXCEPTION, dc072a5cb, NULL }, @@ -87642,6 +87690,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mea481ac1, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {mc2937542, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {md983087b, 0, NULL, NULL }, + {m6786cd98, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {mb1a79b09, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {m1475871, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {mbe735c2e, 0, NULL, NULL }, @@ -89211,6 +89260,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m646b434b, 0, NULL, NULL }, {mf9b1d97b, 0, NULL, NULL }, {m4e411407, 0, NULL, NULL }, + {mf0ab0c85, 0, NULL, NULL }, {m813a1d82, 0, NULL, NULL }, {mafdcb9c8, 0, NULL, NULL }, {md8ac1843, 0, NULL, NULL }, @@ -91997,6 +92047,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m37401912, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m520f98c2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9f009b9c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m4285afa5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc91c99c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mcc1a404a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1ff1353, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -93773,6 +93824,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m2e6ad9d5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {ma97643cb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9a1e1b16, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m3fb34f2a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m890602f4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {med58b7c1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m49d044d, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -95487,6 +95539,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mab5ca6b, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m89bfef37, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {medac4e94, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m49dfb920, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m30f51b13, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m27f60fcd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {md448a9f2, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -96591,6 +96644,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mc321350b, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m2641f298, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {ma52f9a41, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {mec120ac, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m153810b5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m122bcecb, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m54bd24de, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -98063,6 +98117,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m3478d5b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mb54cd4c9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mec963111, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m86dd0dd7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m8db3cc16, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {md2283947, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m68182d8d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, diff --git a/patches/BRM000_Disable-the-ad-promo-system-by-default.patch b/patches/BRM000_Disable-the-ad-promo-system-by-default.patch deleted file mode 100644 index e181b933..00000000 --- a/patches/BRM000_Disable-the-ad-promo-system-by-default.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Wed, 11 Oct 2017 22:47:49 +0200 -Subject: Disable the ad promo system by default - -author: Michael Gilbert -bug-debian: http://bugs.debian.org/634101 ---- - chrome/browser/ui/app_list/app_list_service.cc | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/chrome/browser/ui/app_list/app_list_service.cc b/chrome/browser/ui/app_list/app_list_service.cc ---- a/chrome/browser/ui/app_list/app_list_service.cc -+++ b/chrome/browser/ui/app_list/app_list_service.cc -@@ -142,6 +142,10 @@ void AppListService::RegisterPrefs(PrefRegistrySimple* registry) { - registry->RegisterIntegerPref(prefs::kAppListEnableMethod, - ENABLE_NOT_RECORDED); - registry->RegisterInt64Pref(prefs::kAppListEnableTime, 0); -+ -+ // Identifies whether we should show the app launcher promo or not. This -+ // becomes false when the user dismisses the promo. -+ registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, false); - } - - // static --- -2.7.4 - diff --git a/patches/BRM001_Disable-third-party-cookies-by-default.patch b/patches/BRM001_Disable-third-party-cookies-by-default.patch index ca3b25c3..9ca55a08 100644 --- a/patches/BRM001_Disable-third-party-cookies-by-default.patch +++ b/patches/BRM001_Disable-third-party-cookies-by-default.patch @@ -10,7 +10,7 @@ author: Chad Miller diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc --- a/components/content_settings/core/browser/cookie_settings.cc +++ b/components/content_settings/core/browser/cookie_settings.cc -@@ -100,7 +100,7 @@ void CookieSettings::GetCookieSettings( +@@ -111,7 +111,7 @@ void CookieSettings::GetCookieSettings( void CookieSettings::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( diff --git a/patches/BRM008_promo-disable-Google-promotion-fetching.patch b/patches/BRM008_promo-disable-Google-promotion-fetching.patch index fb4f8faa..59f54e05 100644 --- a/patches/BRM008_promo-disable-Google-promotion-fetching.patch +++ b/patches/BRM008_promo-disable-Google-promotion-fetching.patch @@ -1,4 +1,4 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> +From: Jan Engelhardt Date: Sun, 9 Nov 2014 01:54:27 +0100 Subject: promo: disable Google promotion fetching @@ -15,8 +15,6 @@ Whatever it is that it downloads, deactivate the one that leads to Google. References: https://github.com/iridium-browser/iridium-browser/issues/33 - -author: Jan Engelhardt --- chrome/browser/signin/signin_promo.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/patches/BRM010_Modify-default-preferences.patch b/patches/BRM010_Modify-default-preferences.patch index a5e29318..b70ce814 100644 --- a/patches/BRM010_Modify-default-preferences.patch +++ b/patches/BRM010_Modify-default-preferences.patch @@ -24,7 +24,7 @@ Subject: Modify default preferences diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc --- a/chrome/browser/background/background_mode_manager.cc +++ b/chrome/browser/background/background_mode_manager.cc -@@ -363,7 +363,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -362,7 +362,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false); registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false); #endif @@ -36,7 +36,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -880,7 +880,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( +@@ -990,7 +990,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -48,7 +48,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc -@@ -642,7 +642,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -615,7 +615,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) { std::string()); registry->RegisterBooleanPref(prefs::kEnableReferrers, true); data_reduction_proxy::RegisterPrefs(registry); @@ -104,7 +104,7 @@ diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.h + $i18nRaw{resetPageFeedback} - + diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc --- a/chrome/browser/signin/signin_promo.cc +++ b/chrome/browser/signin/signin_promo.cc @@ -122,7 +122,7 @@ diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signi diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -65,11 +65,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -70,11 +70,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); registry->RegisterBooleanPref( @@ -177,7 +177,7 @@ diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/c diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc --- a/components/autofill/core/browser/autofill_manager.cc +++ b/components/autofill/core/browser/autofill_manager.cc -@@ -215,7 +215,7 @@ void AutofillManager::RegisterProfilePrefs( +@@ -227,7 +227,7 @@ void AutofillManager::RegisterProfilePrefs( registry->RegisterIntegerPref( prefs::kAutofillCreditCardSigninPromoImpressionCount, 0); registry->RegisterBooleanPref( @@ -207,7 +207,7 @@ diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmar diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components/safe_browsing/common/safe_browsing_prefs.cc --- a/components/safe_browsing/common/safe_browsing_prefs.cc +++ b/components/safe_browsing/common/safe_browsing_prefs.cc -@@ -370,9 +370,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { +@@ -374,9 +374,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref( prefs::kSafeBrowsingSawInterstitialScoutReporting, false); registry->RegisterBooleanPref( @@ -222,7 +222,7 @@ diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc --- a/extensions/common/extension.cc +++ b/extensions/common/extension.cc -@@ -330,14 +330,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const { +@@ -368,14 +368,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const { if (is_theme()) return false; diff --git a/patches/BRM011_Do-not-store-passwords-by-default.patch b/patches/BRM011_Do-not-store-passwords-by-default.patch index 6b6de3fc..74fb79b2 100644 --- a/patches/BRM011_Do-not-store-passwords-by-default.patch +++ b/patches/BRM011_Do-not-store-passwords-by-default.patch @@ -20,8 +20,8 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp - prefs::kCredentialsEnableAutosignin, true, + prefs::kCredentialsEnableAutosignin, false, user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF); - registry->RegisterBooleanPref(prefs::kWasObsoleteHttpDataCleaned, false); registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(), + PrefRegistry::NO_REGISTRATION_FLAGS); -- 2.7.4 diff --git a/patches/BRM014_Disable-WebRTC-by-default.patch b/patches/BRM014_Disable-WebRTC-by-default.patch index df9e2865..4b748b81 100644 --- a/patches/BRM014_Disable-WebRTC-by-default.patch +++ b/patches/BRM014_Disable-WebRTC-by-default.patch @@ -9,7 +9,7 @@ Subject: Disable WebRTC by default diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -84,10 +84,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -89,10 +89,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { #endif #if BUILDFLAG(ENABLE_WEBRTC) // TODO(guoweis): Remove next 2 options at M50. diff --git a/patches/BRM016_Skip-the-first-run-and-metrics.patch b/patches/BRM016_Skip-the-first-run-and-metrics.patch index bf4f08cd..62e1bab3 100644 --- a/patches/BRM016_Skip-the-first-run-and-metrics.patch +++ b/patches/BRM016_Skip-the-first-run-and-metrics.patch @@ -56,7 +56,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java -@@ -73,20 +73,14 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm +@@ -74,20 +74,14 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm } }); diff --git a/patches/BRM017_Disable-Omaha-update-checks.patch b/patches/BRM017_Disable-Omaha-update-checks.patch index 37707985..4c2d5feb 100644 --- a/patches/BRM017_Disable-Omaha-update-checks.patch +++ b/patches/BRM017_Disable-Omaha-update-checks.patch @@ -9,7 +9,7 @@ Subject: Disable Omaha update checks diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java -@@ -122,7 +122,7 @@ public class OmahaBase { +@@ -132,7 +132,7 @@ public class OmahaBase { /** See {@link #sIsDisabled}. */ static boolean isDisabled() { diff --git a/patches/BRM022_Fix-crash-when-accessing-page-info-site-settings.patch b/patches/BRM022_Fix-crash-when-accessing-page-info-site-settings.patch index 2019db40..65a5f9e7 100644 --- a/patches/BRM022_Fix-crash-when-accessing-page-info-site-settings.patch +++ b/patches/BRM022_Fix-crash-when-accessing-page-info-site-settings.patch @@ -9,7 +9,7 @@ Subject: Fix crash when accessing page info / site settings diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc --- a/chrome/browser/permissions/permission_manager.cc +++ b/chrome/browser/permissions/permission_manager.cc -@@ -623,6 +623,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper( +@@ -632,6 +632,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper( GURL canonical_requesting_origin = GetCanonicalOrigin(requesting_origin, embedding_origin); PermissionContextBase* context = GetPermissionContext(permission); diff --git a/patches/BRM024_Cure-AMP-and-tracking-from-search-results.patch b/patches/BRM024_Cure-AMP-and-tracking-from-search-results.patch index 4c1f92cb..301ef34f 100644 --- a/patches/BRM024_Cure-AMP-and-tracking-from-search-results.patch +++ b/patches/BRM024_Cure-AMP-and-tracking-from-search-results.patch @@ -3,35 +3,36 @@ Date: Sat, 28 Oct 2017 10:09:41 +0200 Subject: Cure AMP and tracking from search results --- - third_party/WebKit/Source/core/dom/BUILD.gn | 1 + - third_party/WebKit/Source/core/dom/Document.cpp | 19 ++++++++++++++++++- - .../WebKit/Source/core/dom/extensions/anti_amp_cure.h | 6 ++++++ - 3 files changed, 25 insertions(+), 1 deletion(-) - create mode 100644 third_party/WebKit/Source/core/dom/extensions/anti_amp_cure.h + third_party/blink/renderer/core/dom/BUILD.gn | 1 + + third_party/blink/renderer/core/dom/document.cc | 20 +++++++++++++++++++- + .../renderer/core/dom/extensions/anti_amp_cure.h | 6 ++++++ + 3 files changed, 26 insertions(+), 1 deletion(-) + create mode 100644 third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h -diff --git a/third_party/WebKit/Source/core/dom/BUILD.gn b/third_party/WebKit/Source/core/dom/BUILD.gn ---- a/third_party/WebKit/Source/core/dom/BUILD.gn -+++ b/third_party/WebKit/Source/core/dom/BUILD.gn -@@ -301,6 +301,7 @@ blink_core_sources("dom") { - "events/TreeScopeEventContext.h", - "events/WindowEventContext.cpp", - "events/WindowEventContext.h", +diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/renderer/core/dom/BUILD.gn +--- a/third_party/blink/renderer/core/dom/BUILD.gn ++++ b/third_party/blink/renderer/core/dom/BUILD.gn +@@ -147,6 +147,7 @@ blink_core_sources("dom") { + "events/tree_scope_event_context.h", + "events/window_event_context.cc", + "events/window_event_context.h", + "extensions/dont-track-me.h", - "ng/flat_tree_traversal_ng.cc", - "ng/flat_tree_traversal_ng.h", - "trustedtypes/TrustedHTML.cpp", -diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp ---- a/third_party/WebKit/Source/core/dom/Document.cpp -+++ b/third_party/WebKit/Source/core/dom/Document.cpp -@@ -220,6 +220,7 @@ - #include "core/xml/parser/XMLDocumentParser.h" - #include "core/xml_names.h" - #include "core/xmlns_names.h" + "exception_code.h", + "first_letter_pseudo_element.cc", + "first_letter_pseudo_element.h", +diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc +--- a/third_party/blink/renderer/core/dom/document.cc ++++ b/third_party/blink/renderer/core/dom/document.cc +@@ -276,6 +276,8 @@ + #include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h" + #include "third_party/blink/renderer/platform/wtf/time.h" + +#include "extensions/anti_amp_cure.h" - #include "platform/CrossThreadFunctional.h" - #include "platform/DateComponents.h" - #include "platform/EventDispatchForbiddenScope.h" -@@ -5804,8 +5805,24 @@ void Document::FinishedParsing() { ++ + #ifndef NDEBUG + using WeakDocumentSet = + blink::PersistentHeapHashSet>; +@@ -5839,8 +5841,24 @@ void Document::FinishedParsing() { fetcher_->ClearResourcesFromPreviousFetcher(); } @@ -57,15 +58,15 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi } void Document::ElementDataCacheClearTimerFired(TimerBase*) { -diff --git a/third_party/WebKit/Source/core/dom/extensions/anti_amp_cure.h b/third_party/WebKit/Source/core/dom/extensions/anti_amp_cure.h +diff --git a/third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h b/third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h new file mode 100644 --- /dev/null -+++ b/third_party/WebKit/Source/core/dom/extensions/anti_amp_cure.h ++++ b/third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h @@ -0,0 +1,6 @@ +#ifndef anti_amp_cure_h +#define anti_amp_cure_h + -+#define ANTI_AMP_CURE_JS "/* Bromite click-tracking and AMP removal v0.3.5 */\n\nfunction recreateHyperlink(a) {\n // skip already-sanitized hyperlinks\n if (a.sane) return false;\n\n // create new A element - old one has event listeners attached\n var newA = document.createElement('a');\n newA.referrerPolicy = 'origin';\n // property set when hyperlink has been created by this script\n newA.sane = 1;\n\n // remove AMP class, get actual page URL\n var ampCur = a.getAttribute('data-amp-cur');\n if (ampCur) {\n newA.href = ampCur;\n a.classList.remove('amp_r');\n } else {\n var realLink = getRealLinkFromGoogleUrl(a);\n if (realLink) {\n newA.href = realLink;\n } else {\n // might not be an actual hyperlink, ignore it\n if (!a.href) {\n return false;\n }\n // leave original href unchanged\n newA.href = a.href;\n }\n }\n // copy CSS classes\n newA.className = a.className;\n\n // copy nodes inside the hyperlink\n while (a.firstChild) {\n newA.appendChild(a.lastChild);\n }\n // replace hyperlink\n a.parentNode.replaceChild(newA, a);\n return true;\n}\n\nfunction isResult(a) {\n if (a.getAttribute('data-amp-cur'))\n return true;\n var inlineMousedown = a.getAttribute('onmousedown');\n if (!inlineMousedown)\n\treturn false;\n // return rwt(....); // E.g Google search results.\n // return google.rwt(...); // E.g. sponsored search results\n // return google.arwt(this); // E.g. sponsored search results (dec 2016).\n return /\\ba?rwt\\(/.test(inlineMousedown) || /\\bctpacw\\b/.test(inlineMousedown);\n}\n\n/**\n * @returns {String} the real URL if the given link is a Google redirect URL.\n */\nfunction getRealLinkFromGoogleUrl(a) {\n if ((a.hostname === location.hostname || a.hostname.indexOf('www.google.') == 0) &&\n /^\\/(local_)?url$/.test(a.pathname)) {\n // Google Maps / Dito (/local_url?q=)\n // Mobile (/url?q=)\n var url = /[?&](?:q|url)=((?:https?|ftp)[%:][^&]+)/.exec(a.search);\n if (url) {\n return decodeURIComponent(url[1]);\n }\n // Help pages, e.g. safe browsing (/url?...&q=%2Fsupport%2Fanswer...)\n url = /[?&](?:q|url)=((?:%2[Ff]|\\/)[^&]+)/.exec(a.search);\n if (url) {\n return a.origin + decodeURIComponent(url[1]);\n }\n }\n}\n\nfunction sanitizeAds() {\n // scan all divs\n var div = document.getElementById('tads');\n if (div) {\n div.style.display = 'none';\n\treturn true;\n }\n return false;\n}\n\nfunction sanitizeAll() {\n console.log(\"ads removed: \", sanitizeAds());\n console.log(\"hyperlinks sanitized: \", sanitizeAllHyperlinks(document));\n}\n\nfunction hookMoreResults() {\n var extrares = document.getElementById('extrares');\n if (!extrares) {\n console.log(\"could not hook more results\");\n return;\n }\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(n) {\n console.log(\"hyperlinks sanitized on new result node: \", sanitizeAllHyperlinks(n));\n });\n });\n });\n observer.observe(extrares, {childList: true});\n}\n\nfunction setMlogoClick() {\n var mlogo = document.getElementById('qslc');\n if (mlogo && mlogo.children[0]) {\n mlogo = mlogo.children[0];\n mlogo.removeAttribute(\"href\");\n mlogo.setAttribute(\"onclick\", \"sanitizeAll()\");\n console.log(\"logo link replaced\");\n } else {\n console.log(\"could not replace logo link\");\n }\n}\n\nfunction sanitizeAllHyperlinks(rootNode) {\n var saned = 0, total = 0;\n rootNode.querySelectorAll('div[data-hveid]:not([data-hveid=\"\"]) a').forEach(function(a) {\n\ttotal++;\n\tvar res = recreateHyperlink(a);\n\tif (res) saned++;\n });\n console.log(\"sanitized \", saned, \"/\", total, \" hyperlinks\");\n\n return saned;\n}\n\n// avoid running cleanup on non-search pages\nif ((document.location.host.indexOf(\"images.google.\") == -1) && (document.location.host.indexOf(\"news.google.\") == -1)) {\n sanitizeAll();\n}\nsetMlogoClick();\n\nhookMoreResults();\n" ++#define ANTI_AMP_CURE_JS "/* Bromite click-tracking and AMP removal v0.3.5 */\n\nfunction recreateHyperlink(a) {\n // skip already-sanitized hyperlinks\n if (a.sane) return false;\n\n // create new A element - old one has event listeners attached\n var newA = document.createElement('a');\n newA.referrerPolicy = 'origin';\n // property set when hyperlink has been created by this script\n newA.sane = 1;\n\n // remove AMP class, get actual page URL\n var ampCur = a.getAttribute('data-amp-cur');\n if (ampCur) {\n newA.href = ampCur;\n a.classList.remove('amp_r');\n } else {\n var realLink = getRealLinkFromGoogleUrl(a);\n if (realLink) {\n newA.href = realLink;\n } else {\n // might not be an actual hyperlink, ignore it\n if (!a.href) {\n return false;\n }\n // leave original href unchanged\n newA.href = a.href;\n }\n }\n // copy CSS classes\n newA.className = a.className;\n\n // copy nodes inside the hyperlink\n while (a.firstChild) {\n newA.appendChild(a.lastChild);\n }\n // replace hyperlink\n a.parentNode.replaceChild(newA, a);\n return true;\n}\n\nfunction isResult(a) {\n if (a.getAttribute('data-amp-cur'))\n return true;\n var inlineMousedown = a.getAttribute('onmousedown');\n if (!inlineMousedown)\n\treturn false;\n // return rwt(....); // E.g Google search results.\n // return google.rwt(...); // E.g. sponsored search results\n // return google.arwt(this); // E.g. sponsored search results (dec 2016).\n return /\\ba?rwt\\(/.test(inlineMousedown) || /\\bctpacw\\b/.test(inlineMousedown);\n}\n\n/**\n * @returns {String} the real URL if the given link is a Google redirect URL.\n */\nfunction getRealLinkFromGoogleUrl(a) {\n if ((a.hostname === location.hostname || a.hostname.indexOf('www.google.') == 0) &&\n /^\\/(local_)?url$/.test(a.pathname)) {\n // Google Maps / Dito (/local_url?q=)\n // Mobile (/url?q=)\n var url = /[?&](?:q|url)=((?:https?|ftp)[%:][^&]+)/.exec(a.search);\n if (url) {\n return decodeURIComponent(url[1]);\n }\n // Help pages, e.g. safe browsing (/url?...&q=%2Fsupport%2Fanswer...)\n url = /[?&](?:q|url)=((?:%2[Ff]|\\/)[^&]+)/.exec(a.search);\n if (url) {\n return a.origin + decodeURIComponent(url[1]);\n }\n }\n}\n\nfunction sanitizeAds() {\n // scan all divs\n var div = document.getElementById('tads');\n if (div) {\n div.style.display = 'none';\n\treturn true;\n }\n return false;\n}\n\nfunction sanitizeAll() {\n console.log(\"ads removed: \", sanitizeAds());\n console.log(\"hyperlinks sanitized: \", sanitizeAllHyperlinks(document));\n}\n\nfunction hookMoreResults() {\n var extrares = document.getElementById('extrares');\n if (!extrares) {\n console.log(\"could not hook more results\");\n return;\n }\n // mutation observers are great but they don't work\n extrares.addEventListener(\"DOMNodeInserted\", function(e) {\n var node = e.target;\n if (node.id && node.id.startsWith(\"arc-srp\"))\n console.log(\"hyperlinks sanitized on new result node: \", sanitizeAllHyperlinks(node));\n });\n}\n\nfunction setMlogoClick() {\n var mlogo = document.getElementById('qslc');\n if (mlogo && mlogo.children[0]) {\n mlogo = mlogo.children[0];\n mlogo.removeAttribute(\"href\");\n mlogo.setAttribute(\"onclick\", \"sanitizeAll()\");\n console.log(\"logo link replaced\");\n } else {\n console.log(\"could not replace logo link\");\n }\n}\n\nfunction sanitizeAllHyperlinks(rootNode) {\n var saned = 0, total = 0;\n rootNode.querySelectorAll('div[data-hveid]:not([data-hveid=\"\"]) a').forEach(function(a) {\n\ttotal++;\n\tvar res = recreateHyperlink(a);\n\tif (res) saned++;\n });\n console.log(\"sanitized \", saned, \"/\", total, \" hyperlinks\");\n\n return saned;\n}\n\n// avoid running cleanup on non-search pages\nif ((document.location.host.indexOf(\"images.google.\") == -1) && (document.location.host.indexOf(\"news.google.\") == -1)) {\n sanitizeAll();\n}\nsetMlogoClick();\n\nhookMoreResults();\n" + +#endif // anti_amp_cure_h -- diff --git a/patches/BRM025_Play-videos-in-background.patch b/patches/BRM025_Play-videos-in-background.patch index 1f701260..1ca6f89d 100644 --- a/patches/BRM025_Play-videos-in-background.patch +++ b/patches/BRM025_Play-videos-in-background.patch @@ -5,35 +5,35 @@ Subject: Play videos in background Break Page Visibility API and Fullscreen API for youtube.com and vimeo.com Original Javascript code by timdream --- - third_party/WebKit/Source/core/dom/BUILD.gn | 1 + - third_party/WebKit/Source/core/dom/Document.cpp | 17 +++++++++++++---- - .../WebKit/Source/core/dom/extensions/video_bg_play.h | 6 ++++++ + third_party/blink/renderer/core/dom/BUILD.gn | 1 + + third_party/blink/renderer/core/dom/document.cc | 17 +++++++++++++---- + .../blink/renderer/core/dom/extensions/video_bg_play.h | 6 ++++++ 3 files changed, 20 insertions(+), 4 deletions(-) - create mode 100644 third_party/WebKit/Source/core/dom/extensions/video_bg_play.h + create mode 100644 third_party/blink/renderer/core/dom/extensions/video_bg_play.h -diff --git a/third_party/WebKit/Source/core/dom/BUILD.gn b/third_party/WebKit/Source/core/dom/BUILD.gn ---- a/third_party/WebKit/Source/core/dom/BUILD.gn -+++ b/third_party/WebKit/Source/core/dom/BUILD.gn -@@ -302,6 +302,7 @@ blink_core_sources("dom") { - "events/WindowEventContext.cpp", - "events/WindowEventContext.h", +diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/renderer/core/dom/BUILD.gn +--- a/third_party/blink/renderer/core/dom/BUILD.gn ++++ b/third_party/blink/renderer/core/dom/BUILD.gn +@@ -148,6 +148,7 @@ blink_core_sources("dom") { + "events/window_event_context.cc", + "events/window_event_context.h", "extensions/dont-track-me.h", + "extensions/video-bg-play.h", - "ng/flat_tree_traversal_ng.cc", - "ng/flat_tree_traversal_ng.h", - "trustedtypes/TrustedHTML.cpp", -diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp ---- a/third_party/WebKit/Source/core/dom/Document.cpp -+++ b/third_party/WebKit/Source/core/dom/Document.cpp + "exception_code.h", + "first_letter_pseudo_element.cc", + "first_letter_pseudo_element.h", +diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc +--- a/third_party/blink/renderer/core/dom/document.cc ++++ b/third_party/blink/renderer/core/dom/document.cc @@ -221,6 +221,7 @@ - #include "core/xml_names.h" - #include "core/xmlns_names.h" - #include "extensions/anti_amp_cure.h" + #include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h" + #include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h" + #include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h" +#include "extensions/video_bg_play.h" - #include "platform/CrossThreadFunctional.h" - #include "platform/DateComponents.h" - #include "platform/EventDispatchForbiddenScope.h" -@@ -5812,17 +5813,25 @@ void Document::FinishedParsing() { + #include "third_party/blink/renderer/core/paint/compositing/paint_layer_compositor.h" + #include "third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h" + #include "third_party/blink/renderer/core/policy/document_policy.h" +@@ -5848,17 +5849,25 @@ void Document::FinishedParsing() { // determine whether this is a Google search results page const SecurityOrigin *origin = GetSecurityOrigin(); @@ -63,10 +63,10 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi } void Document::ElementDataCacheClearTimerFired(TimerBase*) { -diff --git a/third_party/WebKit/Source/core/dom/extensions/video_bg_play.h b/third_party/WebKit/Source/core/dom/extensions/video_bg_play.h +diff --git a/third_party/blink/renderer/core/dom/extensions/video_bg_play.h b/third_party/blink/renderer/core/dom/extensions/video_bg_play.h new file mode 100644 --- /dev/null -+++ b/third_party/WebKit/Source/core/dom/extensions/video_bg_play.h ++++ b/third_party/blink/renderer/core/dom/extensions/video_bg_play.h @@ -0,0 +1,6 @@ +#ifndef video_bg_play_h +#define video_bg_play_h diff --git a/patches/BRM028_ungoogled-chromium-Disable-signin.patch b/patches/BRM028_ungoogled-chromium-Disable-signin.patch index 24992af4..ab19c3e9 100644 --- a/patches/BRM028_ungoogled-chromium-Disable-signin.patch +++ b/patches/BRM028_ungoogled-chromium-Disable-signin.patch @@ -10,7 +10,7 @@ Subject: ungoogled-chromium: Disable signin diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -76,12 +76,6 @@ void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) { +@@ -77,12 +77,6 @@ void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) { ShowSingletonTabOverwritingNTP(browser, params); } @@ -23,7 +23,7 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages. // Shows either the help app or the appropriate help page for |source|. If // |browser| is NULL and the help page is used (vs the app), the help page is // shown in the last active browser. If there is no such browser, a new browser -@@ -396,6 +390,7 @@ void ShowSearchEngineSettings(Browser* browser) { +@@ -397,6 +391,7 @@ void ShowSearchEngineSettings(Browser* browser) { #if !defined(OS_ANDROID) void ShowBrowserSignin(Browser* browser, signin_metrics::AccessPoint access_point) { @@ -31,9 +31,9 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages. Profile* original_profile = browser->profile()->GetOriginalProfile(); SigninManagerBase* manager = SigninManagerFactory::GetForProfile(original_profile); -@@ -436,6 +431,7 @@ void ShowBrowserSignin(Browser* browser, - false)); - DCHECK_GT(browser->tab_strip_model()->count(), 0); +@@ -442,6 +437,7 @@ void ShowBrowserSignin(Browser* browser, + BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN, + signin::ManageAccountsParams(), access_point, false); } +#endif } diff --git a/patches/BRM030_ungoogled-chromium-Disable-untraceable-URLs.patch b/patches/BRM030_ungoogled-chromium-Disable-untraceable-URLs.patch index e7044688..115cedf9 100644 --- a/patches/BRM030_ungoogled-chromium-Disable-untraceable-URLs.patch +++ b/patches/BRM030_ungoogled-chromium-Disable-untraceable-URLs.patch @@ -28,7 +28,7 @@ diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/and diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc --- a/chrome/browser/plugins/plugins_resource_service.cc +++ b/chrome/browser/plugins/plugins_resource_service.cc -@@ -52,9 +52,6 @@ const int kStartResourceFetchDelayMs = 60 * 1000; +@@ -51,9 +51,6 @@ const int kStartResourceFetchDelayMs = 60 * 1000; // Delay between calls to update the cache 1 day and 2 minutes in testing mode. const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000; @@ -38,7 +38,7 @@ diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser GURL GetPluginsServerURL() { std::string filename; #if defined(OS_WIN) -@@ -69,7 +66,7 @@ GURL GetPluginsServerURL() { +@@ -68,7 +65,7 @@ GURL GetPluginsServerURL() { #error Unknown platform #endif @@ -50,7 +50,7 @@ diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/browser/safe_browsing/client_side_model_loader.cc --- a/chrome/browser/safe_browsing/client_side_model_loader.cc +++ b/chrome/browser/safe_browsing/client_side_model_loader.cc -@@ -34,8 +34,6 @@ namespace safe_browsing { +@@ -35,8 +35,6 @@ namespace safe_browsing { // Model Loader strings const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024; const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000; @@ -59,39 +59,39 @@ diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/b const char ModelLoader::kClientModelNamePattern[] = "client_model_v5%s_variation_%d.pb"; const char ModelLoader::kClientModelFinchExperiment[] = -@@ -88,7 +86,7 @@ ModelLoader::ModelLoader(base::Closure update_renderers_callback, - net::URLRequestContextGetter* request_context_getter, - bool is_extended_reporting) +@@ -90,7 +88,7 @@ ModelLoader::ModelLoader( + scoped_refptr url_loader_factory, + bool is_extended_reporting) : name_(FillInModelName(is_extended_reporting, GetModelNumber())), - url_(kClientModelUrlPrefix + name_), + url_("about:blank"), update_renderers_callback_(update_renderers_callback), - request_context_getter_(request_context_getter), + url_loader_factory_(url_loader_factory), weak_factory_(this) { -@@ -99,7 +97,7 @@ ModelLoader::ModelLoader(base::Closure update_renderers_callback, - ModelLoader::ModelLoader(base::Closure update_renderers_callback, - const std::string& model_name) +@@ -103,7 +101,7 @@ ModelLoader::ModelLoader( + scoped_refptr url_loader_factory, + const std::string& model_name) : name_(model_name), - url_(kClientModelUrlPrefix + name_), + url_("about:blank"), update_renderers_callback_(update_renderers_callback), - request_context_getter_(NULL), + url_loader_factory_(url_loader_factory), weak_factory_(this) { diff --git a/chrome/browser/safe_browsing/client_side_model_loader.h b/chrome/browser/safe_browsing/client_side_model_loader.h --- a/chrome/browser/safe_browsing/client_side_model_loader.h +++ b/chrome/browser/safe_browsing/client_side_model_loader.h -@@ -43,7 +43,6 @@ class ModelLoader : public net::URLFetcherDelegate { +@@ -42,7 +42,6 @@ class ModelLoader { static const int kClientModelFetchIntervalMs; static const char kClientModelFinchExperiment[]; static const char kClientModelFinchParam[]; - static const char kClientModelUrlPrefix[]; static const char kClientModelNamePattern[]; - // Constructs a model loader to fetch a model using |request_context_getter|. + // Constructs a model loader to fetch a model using |url_loader_factory|. diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc --- a/rlz/lib/financial_ping.cc +++ b/rlz/lib/financial_ping.cc -@@ -366,7 +366,7 @@ bool FinancialPing::PingServer(const char* request, std::string* response) { +@@ -351,7 +351,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request, // Open network connection. InternetHandle connection_handle = InternetConnectA(inet_handle, @@ -99,9 +99,9 @@ diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc + "about:blank", kFinancialPort, "", "", INTERNET_SERVICE_HTTP, INTERNET_FLAG_NO_CACHE_WRITE, 0); if (!connection_handle) - return false; -@@ -410,7 +410,7 @@ bool FinancialPing::PingServer(const char* request, std::string* response) { - return true; + return PING_FAILURE; +@@ -395,7 +395,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request, + return PING_SUCCESSFUL; #else std::string url = - base::StringPrintf("https://%s%s", kFinancialServer, request); diff --git a/patches/BRM033_ungoogled-chromium-Disable-intranet-redirect-detector.patch b/patches/BRM033_ungoogled-chromium-Disable-intranet-redirect-detector.patch index b536815c..64547d0a 100644 --- a/patches/BRM033_ungoogled-chromium-Disable-intranet-redirect-detector.patch +++ b/patches/BRM033_ungoogled-chromium-Disable-intranet-redirect-detector.patch @@ -12,8 +12,8 @@ See this page for more information: https://mikewest.org/2012/02/chrome-connects diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc --- a/chrome/browser/intranet_redirect_detector.cc +++ b/chrome/browser/intranet_redirect_detector.cc -@@ -72,9 +72,7 @@ void IntranetRedirectDetector::FinishSleep() { - fetchers_.clear(); +@@ -75,9 +75,7 @@ void IntranetRedirectDetector::FinishSleep() { + simple_loaders_.clear(); resulting_origins_.clear(); - const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -21,7 +21,7 @@ diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intra - return; + return; - DCHECK(fetchers_.empty() && resulting_origins_.empty()); + DCHECK(simple_loaders_.empty() && resulting_origins_.empty()); -- 2.7.4 diff --git a/patches/BRM034_ungoogled-chromium-Disable-Google-host-detection.patch b/patches/BRM034_ungoogled-chromium-Disable-Google-host-detection.patch index af4b244f..97aa39d9 100644 --- a/patches/BRM034_ungoogled-chromium-Disable-Google-host-detection.patch +++ b/patches/BRM034_ungoogled-chromium-Disable-Google-host-detection.patch @@ -7,9 +7,9 @@ Disables various detections of Google hosts and functionality specific to them .../page_load_metrics/page_load_metrics_util.cc | 4 +- .../page_load_metrics/page_load_metrics_util.cc | 33 +--- components/google/core/browser/google_util.cc | 193 ++------------------- - components/search_engines/template_url.cc | 5 - + components/search_engines/template_url.cc | 6 +- net/base/url_util.cc | 22 --- - 5 files changed, 13 insertions(+), 244 deletions(-) + 5 files changed, 14 insertions(+), 244 deletions(-) diff --git a/chrome/browser/page_load_metrics/page_load_metrics_util.cc b/chrome/browser/page_load_metrics/page_load_metrics_util.cc --- a/chrome/browser/page_load_metrics/page_load_metrics_util.cc @@ -324,22 +324,23 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc --- a/components/search_engines/template_url.cc +++ b/components/search_engines/template_url.cc -@@ -510,11 +510,6 @@ base::string16 TemplateURLRef::SearchTermToString16( +@@ -510,11 +510,7 @@ base::string16 TemplateURLRef::SearchTermToString16( bool TemplateURLRef::HasGoogleBaseURLs( const SearchTermsData& search_terms_data) const { ParseIfNecessary(search_terms_data); -- for (size_t i = 0; i < replacements_.size(); ++i) { -- if ((replacements_[i].type == GOOGLE_BASE_URL) || -- (replacements_[i].type == GOOGLE_BASE_SUGGEST_URL)) -- return true; -- } - return false; +- return std::any_of(replacements_.begin(), replacements_.end(), +- [](const Replacement& replacement) { +- return replacement.type == GOOGLE_BASE_URL || +- replacement.type == GOOGLE_BASE_SUGGEST_URL; +- }); ++ return false; } + bool TemplateURLRef::ExtractSearchTermsFromURL( diff --git a/net/base/url_util.cc b/net/base/url_util.cc --- a/net/base/url_util.cc +++ b/net/base/url_util.cc -@@ -397,28 +397,6 @@ void GetIdentityFromURL(const GURL& url, +@@ -383,28 +383,6 @@ void GetIdentityFromURL(const GURL& url, } bool HasGoogleHost(const GURL& url) { diff --git a/patches/BRM036_ungoogled-chromium-Disable-Gaia.patch b/patches/BRM036_ungoogled-chromium-Disable-Gaia.patch index 4ca07926..8434a16f 100644 --- a/patches/BRM036_ungoogled-chromium-Disable-Gaia.patch +++ b/patches/BRM036_ungoogled-chromium-Disable-Gaia.patch @@ -18,7 +18,7 @@ See also: https://github.com/Eloston/ungoogled-chromium/issues/104 diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd -@@ -299,7 +299,6 @@ +@@ -301,7 +301,6 @@ @@ -26,7 +26,7 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou -@@ -435,7 +434,6 @@ +@@ -436,7 +435,6 @@ @@ -93,7 +93,7 @@ diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc --- a/google_apis/gaia/gaia_auth_fetcher.cc +++ b/google_apis/gaia/gaia_auth_fetcher.cc -@@ -219,35 +219,6 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher( +@@ -248,35 +248,6 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher( int load_flags, const net::NetworkTrafficAnnotationTag& traffic_annotation) { DCHECK(!fetch_pending_) << "Tried to fetch two things at once!"; diff --git a/patches/BRM037_ungoogled-chromium-Clear-HTTP-cache-menu-item.patch b/patches/BRM037_ungoogled-chromium-Clear-HTTP-cache-menu-item.patch index 8eb6d62a..787f20e9 100644 --- a/patches/BRM037_ungoogled-chromium-Clear-HTTP-cache-menu-item.patch +++ b/patches/BRM037_ungoogled-chromium-Clear-HTTP-cache-menu-item.patch @@ -19,7 +19,7 @@ Adds a menu item under "More tools" to clear the HTTP authentication cache on de diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h --- a/chrome/app/chrome_command_ids.h +++ b/chrome/app/chrome_command_ids.h -@@ -150,6 +150,7 @@ +@@ -152,6 +152,7 @@ #define IDC_DEV_TOOLS_INSPECT 40023 #define IDC_UPGRADE_DIALOG 40024 #define IDC_VIEW_INCOMPATIBILITIES 40025 @@ -30,7 +30,7 @@ diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd -@@ -1050,6 +1050,9 @@ are declared in build/common.gypi. +@@ -1053,6 +1053,9 @@ are declared in build/common.gypi. &Clear browsing data... @@ -40,7 +40,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources &Downloads -@@ -1088,6 +1091,9 @@ are declared in build/common.gypi. +@@ -1091,6 +1094,9 @@ are declared in build/common.gypi. &Clear Browsing Data... @@ -53,9 +53,9 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -59,6 +59,9 @@ +@@ -60,6 +60,9 @@ #include "extensions/browser/extension_system.h" - #include "printing/features/features.h" + #include "printing/buildflags/buildflags.h" #include "ui/events/keycodes/keyboard_codes.h" +#include "net/url_request/url_request_context.h" +#include "net/url_request/url_request_context_getter.h" @@ -63,7 +63,7 @@ diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui #if defined(OS_MACOSX) #include "chrome/browser/ui/browser_commands_mac.h" -@@ -624,6 +627,9 @@ bool BrowserCommandController::ExecuteCommandWithDisposition( +@@ -629,6 +632,9 @@ bool BrowserCommandController::ExecuteCommandWithDisposition( case IDC_CLEAR_BROWSING_DATA: ShowClearBrowsingDataDialog(browser_); break; @@ -73,7 +73,7 @@ diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui case IDC_IMPORT_SETTINGS: ShowImportDialog(browser_); break; -@@ -865,6 +871,7 @@ void BrowserCommandController::InitCommandState() { +@@ -871,6 +877,7 @@ void BrowserCommandController::InitCommandState() { !profile()->IsOffTheRecord()); command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA, !guest_session); @@ -157,7 +157,7 @@ diff --git a/net/http/http_auth_cache.h b/net/http/http_auth_cache.h diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml -@@ -47004,6 +47004,7 @@ Called by update_traffic_annotation_histograms.py.--> +@@ -48308,6 +48308,7 @@ Full version information for the fingerprint enum values: @@ -168,7 +168,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml -@@ -104632,6 +104632,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries. +@@ -107908,6 +107908,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries. diff --git a/patches/BRM038_url_request-hooks-and-ad-url-data.patch b/patches/BRM038_url_request-hooks-and-ad-url-data.patch index 29de1eae..5d430d6e 100644 --- a/patches/BRM038_url_request-hooks-and-ad-url-data.patch +++ b/patches/BRM038_url_request-hooks-and-ad-url-data.patch @@ -14,7 +14,7 @@ Subject: url_request: hooks and ad url data diff --git a/net/BUILD.gn b/net/BUILD.gn --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1748,6 +1748,8 @@ component("net") { +@@ -1756,6 +1756,8 @@ component("net") { "url_request/url_fetcher_response_writer.h", "url_request/url_range_request_job.cc", "url_request/url_range_request_job.h", @@ -166,7 +166,7 @@ new file mode 100644 diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc --- a/net/url_request/url_request.cc +++ b/net/url_request/url_request.cc -@@ -43,6 +43,8 @@ +@@ -44,6 +44,8 @@ #include "url/gurl.h" #include "url/origin.h" @@ -175,7 +175,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc #if BUILDFLAG(ENABLE_REPORTING) #include "net/network_error_logging/network_error_logging_service.h" #include "net/reporting/reporting_service.h" -@@ -581,6 +583,8 @@ URLRequest::URLRequest(const GURL& url, +@@ -583,6 +585,8 @@ URLRequest::URLRequest(const GURL& url, // Sanity check out environment. DCHECK(base::ThreadTaskRunnerHandle::IsSet()); diff --git a/patches/BRM039_Bromite-adblock-engine.patch b/patches/BRM039_Bromite-adblock-engine.patch index ca5f7607..49507738 100644 --- a/patches/BRM039_Bromite-adblock-engine.patch +++ b/patches/BRM039_Bromite-adblock-engine.patch @@ -22,7 +22,7 @@ Re-land: third-party filters support diff --git a/net/BUILD.gn b/net/BUILD.gn --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1748,8 +1748,6 @@ component("net") { +@@ -1756,8 +1756,6 @@ component("net") { "url_request/url_fetcher_response_writer.h", "url_request/url_range_request_job.cc", "url_request/url_range_request_job.h", @@ -31,7 +31,7 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn "url_request/url_request.cc", "url_request/url_request.h", "url_request/url_request_context.cc", -@@ -1810,6 +1808,13 @@ component("net") { +@@ -1815,6 +1813,13 @@ component("net") { "//third_party/zlib", ] @@ -538,7 +538,7 @@ deleted file mode 100644 diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc --- a/net/url_request/url_request.cc +++ b/net/url_request/url_request.cc -@@ -43,7 +43,9 @@ +@@ -44,7 +44,9 @@ #include "url/gurl.h" #include "url/origin.h" @@ -549,17 +549,17 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc #if BUILDFLAG(ENABLE_REPORTING) #include "net/network_error_logging/network_error_logging_service.h" -@@ -558,7 +560,9 @@ URLRequest::URLRequest(const GURL& url, +@@ -559,7 +561,9 @@ URLRequest::URLRequest(const GURL& url, : context->network_delegate()), net_log_(NetLogWithSource::Make(context->net_log(), NetLogSourceType::URL_REQUEST)), +#if !defined(OS_ANDROID) url_chain_(1, url), +#endif + attach_same_site_cookies_(false), method_("GET"), referrer_policy_(CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE), - first_party_url_policy_(NEVER_CHANGE_FIRST_PARTY_URL), -@@ -583,7 +587,18 @@ URLRequest::URLRequest(const GURL& url, +@@ -585,7 +589,18 @@ URLRequest::URLRequest(const GURL& url, // Sanity check out environment. DCHECK(base::ThreadTaskRunnerHandle::IsSet()); diff --git a/patches/BRM041_Battery-API-return-nothing.patch b/patches/BRM041_Battery-API-return-nothing.patch index 8cfcc405..b7aef748 100644 --- a/patches/BRM041_Battery-API-return-nothing.patch +++ b/patches/BRM041_Battery-API-return-nothing.patch @@ -4,7 +4,7 @@ Subject: Battery API: return nothing --- services/device/battery/battery_status_service.cc | 2 +- - .../Source/modules/battery/BatteryManager.cpp | 25 ++++------------------ + .../renderer/modules/battery/battery_manager.cc | 25 ++++------------------ 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc @@ -19,9 +19,9 @@ diff --git a/services/device/battery/battery_status_service.cc b/services/device if (callback_list_.empty()) { bool success = battery_fetcher_->StartListeningBatteryChange(); // On failure pass the default values back. -diff --git a/third_party/WebKit/Source/modules/battery/BatteryManager.cpp b/third_party/WebKit/Source/modules/battery/BatteryManager.cpp ---- a/third_party/WebKit/Source/modules/battery/BatteryManager.cpp -+++ b/third_party/WebKit/Source/modules/battery/BatteryManager.cpp +diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc +--- a/third_party/blink/renderer/modules/battery/battery_manager.cc ++++ b/third_party/blink/renderer/modules/battery/battery_manager.cc @@ -42,45 +42,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) { } diff --git a/patches/BRM042_Disable-plugins-enumeration.patch b/patches/BRM042_Disable-plugins-enumeration.patch index 5b16cc81..56e2276f 100644 --- a/patches/BRM042_Disable-plugins-enumeration.patch +++ b/patches/BRM042_Disable-plugins-enumeration.patch @@ -3,13 +3,13 @@ Date: Thu, 22 Mar 2018 22:38:00 +0100 Subject: Disable plugins enumeration --- - third_party/WebKit/Source/core/frame/LocalFrame.cpp | 6 ++---- + third_party/blink/renderer/core/frame/local_frame.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp ---- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp -+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp -@@ -1134,10 +1134,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { +diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc +--- a/third_party/blink/renderer/core/frame/local_frame.cc ++++ b/third_party/blink/renderer/core/frame/local_frame.cc +@@ -1175,10 +1175,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { } PluginData* LocalFrame::GetPluginData() const { diff --git a/patches/BRM043_AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch b/patches/BRM043_AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch index 8a867248..24803ee1 100644 --- a/patches/BRM043_AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch +++ b/patches/BRM043_AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch @@ -4,14 +4,14 @@ Subject: AudioBuffer, AnalyserNode: fingerprinting mitigations via IDL Return fixed base latency --- - third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl | 8 ++++---- - third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl | 4 ++-- - third_party/WebKit/Source/modules/webaudio/AudioContext.cpp | 2 +- + third_party/blink/renderer/modules/webaudio/analyser_node.idl | 8 ++++---- + third_party/blink/renderer/modules/webaudio/audio_buffer.idl | 4 ++-- + third_party/blink/renderer/modules/webaudio/audio_context.cc | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) -diff --git a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl b/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl ---- a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl -+++ b/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl +diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.idl b/third_party/blink/renderer/modules/webaudio/analyser_node.idl +--- a/third_party/blink/renderer/modules/webaudio/analyser_node.idl ++++ b/third_party/blink/renderer/modules/webaudio/analyser_node.idl @@ -42,10 +42,10 @@ interface AnalyserNode : AudioNode { // Copies the current frequency data into the passed array. @@ -27,9 +27,9 @@ diff --git a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl b/third + //void getFloatTimeDomainData(Float32Array array); + //void getByteTimeDomainData(Uint8Array array); }; -diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl b/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl ---- a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl -+++ b/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl +diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl +--- a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl ++++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl @@ -38,7 +38,7 @@ // Channel access @@ -40,9 +40,9 @@ diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl b/third_ + //[RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long startInChannel = 0); [RaisesException] void copyToChannel(Float32Array source, long channelNumber, optional unsigned long startInChannel = 0); }; -diff --git a/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp b/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp ---- a/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp -+++ b/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp +diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc +--- a/third_party/blink/renderer/modules/webaudio/audio_context.cc ++++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc @@ -261,7 +261,7 @@ void AudioContext::StopRendering() { } diff --git a/patches/BRM044_Add-menu-option-to-toggle-global-Javascript-preference.patch b/patches/BRM044_Add-menu-option-to-toggle-global-Javascript-preference.patch index 24ac8dd1..011bdf59 100644 --- a/patches/BRM044_Add-menu-option-to-toggle-global-Javascript-preference.patch +++ b/patches/BRM044_Add-menu-option-to-toggle-global-Javascript-preference.patch @@ -61,7 +61,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java -@@ -2006,6 +2006,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -2050,6 +2050,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity final boolean usingDesktopUserAgent = currentTab.getUseDesktopUserAgent(); currentTab.setUseDesktopUserAgent(!usingDesktopUserAgent, reloadOnChange); RecordUserAction.record("MobileMenuRequestDesktopSite"); @@ -79,7 +79,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -1796,6 +1796,14 @@ public class ChromeTabbedActivity +@@ -1710,6 +1710,14 @@ public class ChromeTabbedActivity NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER); } RecordUserAction.record("MobileMenuDownloadManager"); @@ -97,7 +97,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java -@@ -213,6 +213,8 @@ public class AppMenuPropertiesDelegate { +@@ -214,6 +214,8 @@ public class AppMenuPropertiesDelegate { updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */); @@ -106,7 +106,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu // Only display reader mode settings menu option if the current page is in reader mode. menu.findItem(R.id.reader_mode_prefs_id) .setVisible(DomDistillerUrlUtils.isDistilledPage(currentTab.getUrl())); -@@ -468,4 +470,39 @@ public class AppMenuPropertiesDelegate { +@@ -469,4 +471,39 @@ public class AppMenuPropertiesDelegate { return chromeHomeMenuItemFlagEnabled && !sHideChromeHomeMenuItems; } @@ -149,7 +149,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java -@@ -164,6 +164,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat +@@ -171,6 +171,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat } updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible); @@ -160,7 +160,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 -@@ -2491,6 +2491,17 @@ To obtain new licenses, connect to the internet and play your downloaded content +@@ -2548,6 +2548,17 @@ Google may use your browsing activity, content on some sites you visit, and othe Find in page diff --git a/patches/BRM045_Remove-google-account-access-permission-on-reboot.patch b/patches/BRM045_Remove-google-account-access-permission-on-reboot.patch index 4e5f996f..4770636d 100644 --- a/patches/BRM045_Remove-google-account-access-permission-on-reboot.patch +++ b/patches/BRM045_Remove-google-account-access-permission-on-reboot.patch @@ -10,9 +10,9 @@ Subject: Remove google account access permission on reboot diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -726,8 +726,7 @@ android_assets("chrome_public_locale_pak_assets") { - jinja_template_resources("chrome_public_apk_template_resources") { +@@ -784,8 +784,7 @@ jinja_template_resources("chrome_public_apk_template_resources") { resources = [ + "java/res_template/xml/file_paths.xml", "java/res_template/xml/launchershortcuts.xml", - "java/res_template/xml/searchable.xml", - "java/res_template/xml/syncadapter.xml", @@ -23,7 +23,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml -@@ -822,14 +822,14 @@ by a child template that "extends" this file. +@@ -804,14 +804,14 @@ by a child template that "extends" this file. diff --git a/patches/BRM046_Punt-the-Widevine-version-string.patch b/patches/BRM046_Punt-the-Widevine-version-string.patch index 69a9c24f..4d01f500 100644 --- a/patches/BRM046_Punt-the-Widevine-version-string.patch +++ b/patches/BRM046_Punt-the-Widevine-version-string.patch @@ -4,28 +4,16 @@ Subject: Punt the Widevine version string Originally from http://bazaar.launchpad.net/~saiarcot895/chromium-browser/chromium-browser.wily.beta/view/head:/debian/patches/fix_building_widevinecdm_with_chromium.patch --- - chrome/common/chrome_content_client.cc | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) + chrome/common/chrome_content_client.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc -@@ -238,10 +238,7 @@ void ComputeBuiltInPlugins(std::vector* plugins) { - info.is_out_of_process = true; - info.path = adapter_path; - info.name = kWidevineCdmDisplayName; -- info.description = -- base::StringPrintf("%s (version: " WIDEVINE_CDM_VERSION_STRING ")", -- kWidevineCdmDescription); -- info.version = WIDEVINE_CDM_VERSION_STRING; -+ info.description = kWidevineCdmDescription; - info.permissions = kWidevineCdmPluginPermissions; - - content::WebPluginMimeType mime_type(kWidevineCdmPluginMimeType, -@@ -566,7 +563,7 @@ void ChromeContentClient::AddContentDecryptionModules( - // CdmInfo needs |path| to be the actual Widevine library, - // not the adapter, so adjust as necessary. It will be in the - // same directory as the installed adapter. +@@ -526,7 +526,7 @@ void ChromeContentClient::AddContentDecryptionModules( + bool supports_persistent_license = false; + if (IsWidevineAvailable(&cdm_path, &video_codecs_supported, + &supports_persistent_license)) { - const base::Version version(WIDEVINE_CDM_VERSION_STRING); + const base::Version version("1.0.123.456"); DCHECK(version.IsValid()); diff --git a/patches/BRM047_Disable-metrics-on-all-I-O-threads.patch b/patches/BRM047_Disable-metrics-on-all-I-O-threads.patch index 2b17509c..cb130d29 100644 --- a/patches/BRM047_Disable-metrics-on-all-I-O-threads.patch +++ b/patches/BRM047_Disable-metrics-on-all-I-O-threads.patch @@ -9,7 +9,7 @@ Subject: Disable metrics on all I/O threads diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc -@@ -971,7 +971,7 @@ void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() { +@@ -964,7 +964,7 @@ void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() { bool ProfileIOData::GetMetricsEnabledStateOnIOThread() const { DCHECK_CURRENTLY_ON(BrowserThread::IO); diff --git a/patches/BRM049_Add-fingerprinting-mitigation-for-getClientRects-getBoundingClientRect.patch b/patches/BRM049_Add-fingerprinting-mitigation-for-getClientRects-getBoundingClientRect.patch index 5dc18813..80ed1de2 100644 --- a/patches/BRM049_Add-fingerprinting-mitigation-for-getClientRects-getBoundingClientRect.patch +++ b/patches/BRM049_Add-fingerprinting-mitigation-for-getClientRects-getBoundingClientRect.patch @@ -13,25 +13,25 @@ used for fingerprinting and sufficient to poison the well. See also: http://www.gsd.inesc-id.pt/~mpc/pubs/fingerprinting-trustcom2016.pdf --- - third_party/WebKit/Source/core/dom/Document.cpp | 14 ++++++++++++++ - third_party/WebKit/Source/core/dom/Document.h | 5 +++++ - third_party/WebKit/Source/core/dom/Element.cpp | 7 +++++++ - third_party/WebKit/Source/core/dom/Range.cpp | 8 +++++++- + third_party/blink/renderer/core/dom/document.cc | 14 ++++++++++++++ + third_party/blink/renderer/core/dom/document.h | 5 +++++ + third_party/blink/renderer/core/dom/element.cc | 7 +++++++ + third_party/blink/renderer/core/dom/range.cc | 8 +++++++- 4 files changed, 33 insertions(+), 1 deletion(-) -diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp ---- a/third_party/WebKit/Source/core/dom/Document.cpp -+++ b/third_party/WebKit/Source/core/dom/Document.cpp -@@ -272,6 +272,8 @@ - #include "services/service_manager/public/cpp/interface_provider.h" - #include "third_party/WebKit/public/mojom/page/page_visibility_state.mojom-blink.h" +diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc +--- a/third_party/blink/renderer/core/dom/document.cc ++++ b/third_party/blink/renderer/core/dom/document.cc +@@ -279,6 +279,8 @@ + + #include "extensions/anti_amp_cure.h" +#include "base/rand_util.h" + #ifndef NDEBUG using WeakDocumentSet = blink::PersistentHeapHashSet>; -@@ -731,6 +733,10 @@ Document::Document(const DocumentInit& initializer, +@@ -740,6 +742,10 @@ Document::Document(const DocumentInit& initializer, #ifndef NDEBUG liveDocumentSet().insert(this); #endif @@ -42,7 +42,7 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi } Document::~Document() { -@@ -757,6 +763,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope, +@@ -766,6 +772,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope, Position::BeforeNode(*shadow_host)); } @@ -57,10 +57,10 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi SelectorQueryCache& Document::GetSelectorQueryCache() { if (!selector_query_cache_) selector_query_cache_ = std::make_unique(); -diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/Source/core/dom/Document.h ---- a/third_party/WebKit/Source/core/dom/Document.h -+++ b/third_party/WebKit/Source/core/dom/Document.h -@@ -406,6 +406,9 @@ class CORE_EXPORT Document : public ContainerNode, +diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h +--- a/third_party/blink/renderer/core/dom/document.h ++++ b/third_party/blink/renderer/core/dom/document.h +@@ -408,6 +408,9 @@ class CORE_EXPORT Document : public ContainerNode, String origin() const; @@ -70,7 +70,7 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/ String visibilityState() const; mojom::PageVisibilityState GetPageVisibilityState() const; bool hidden() const; -@@ -1663,6 +1666,8 @@ class CORE_EXPORT Document : public ContainerNode, +@@ -1670,6 +1673,8 @@ class CORE_EXPORT Document : public ContainerNode, double start_time_; @@ -79,10 +79,10 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/ TraceWrapperMember script_runner_; HeapVector> current_script_stack_; -diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp ---- a/third_party/WebKit/Source/core/dom/Element.cpp -+++ b/third_party/WebKit/Source/core/dom/Element.cpp -@@ -1327,6 +1327,11 @@ DOMRectList* Element::getClientRects() { +diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc +--- a/third_party/blink/renderer/core/dom/element.cc ++++ b/third_party/blink/renderer/core/dom/element.cc +@@ -1348,6 +1348,11 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom( quads, *element_layout_object); @@ -94,7 +94,7 @@ diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit return DOMRectList::Create(quads); } -@@ -1344,6 +1349,8 @@ DOMRect* Element::getBoundingClientRect() { +@@ -1365,6 +1370,8 @@ DOMRect* Element::getBoundingClientRect() { DCHECK(element_layout_object); GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -103,10 +103,10 @@ diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit return DOMRect::FromFloatRect(result); } -diff --git a/third_party/WebKit/Source/core/dom/Range.cpp b/third_party/WebKit/Source/core/dom/Range.cpp ---- a/third_party/WebKit/Source/core/dom/Range.cpp -+++ b/third_party/WebKit/Source/core/dom/Range.cpp -@@ -1589,11 +1589,17 @@ DOMRectList* Range::getClientRects() const { +diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/renderer/core/dom/range.cc +--- a/third_party/blink/renderer/core/dom/range.cc ++++ b/third_party/blink/renderer/core/dom/range.cc +@@ -1575,11 +1575,17 @@ DOMRectList* Range::getClientRects() const { Vector quads; GetBorderAndTextQuads(quads); diff --git a/patches/BRM051_Canvas-fingerprinting-mitigations-via-IDL.patch b/patches/BRM051_Canvas-fingerprinting-mitigations-via-IDL.patch index ea41be30..f5c837d3 100644 --- a/patches/BRM051_Canvas-fingerprinting-mitigations-via-IDL.patch +++ b/patches/BRM051_Canvas-fingerprinting-mitigations-via-IDL.patch @@ -4,14 +4,14 @@ Subject: Canvas: fingerprinting mitigations via IDL Disable toDataURL, toBlob, getImageData and webGL renderering info --- - third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl | 4 ++-- - .../Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl | 4 ++-- - third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp | 4 ++-- + third_party/blink/renderer/core/html/canvas/html_canvas_element.idl | 4 ++-- + .../renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl | 4 ++-- + third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) -diff --git a/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl b/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl ---- a/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl -+++ b/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl +diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl b/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl +--- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl ++++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl @@ -37,9 +37,9 @@ interface HTMLCanvasElement : HTMLElement // Note: The arguments argument is variadic in the spec, but not here as // only one extra argument is actually used. @@ -24,9 +24,9 @@ diff --git a/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl b/ }; // https://html.spec.whatwg.org/multipage/canvas.html#blobcallback -diff --git a/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl b/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl ---- a/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl -+++ b/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl +diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl +--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl ++++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl @@ -110,7 +110,7 @@ interface CanvasRenderingContext2D { // text (see also the CanvasDrawingStyles interface) void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth); @@ -45,9 +45,9 @@ diff --git a/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingCo [RaisesException] void putImageData(ImageData imagedata, long dx, long dy); [RaisesException] void putImageData(ImageData imagedata, long dx, long dy, long dirtyX, long dirtyY, long dirtyWidth, long dirtyHeight); -diff --git a/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp b/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp ---- a/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp -+++ b/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp +diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc +--- a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc ++++ b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc @@ -37,11 +37,11 @@ WebGLExtensionName WebGLDebugRendererInfo::GetName() const { WebGLDebugRendererInfo* WebGLDebugRendererInfo::Create( diff --git a/patches/BRM052_Started-work-on-canvas-randomisation.patch b/patches/BRM052_Started-work-on-canvas-randomisation.patch index c58a6a8f..a70d75b2 100644 --- a/patches/BRM052_Started-work-on-canvas-randomisation.patch +++ b/patches/BRM052_Started-work-on-canvas-randomisation.patch @@ -4,24 +4,24 @@ Subject: Started work on canvas randomisation Add shuffling for TextMetrics --- - .../Source/core/html/canvas/CanvasAsyncBlobCreator.cpp | 14 +++++++------- - .../Source/core/html/canvas/CanvasAsyncBlobCreator.h | 6 +++--- - .../WebKit/Source/core/html/canvas/HTMLCanvasElement.cpp | 4 ++-- - third_party/WebKit/Source/core/html/canvas/TextMetrics.cpp | 4 ++++ - third_party/WebKit/Source/core/html/canvas/TextMetrics.h | 2 ++ - .../WebKit/Source/core/inspector/InspectorAuditsAgent.cpp | 2 +- - .../WebKit/Source/core/offscreencanvas/OffscreenCanvas.cpp | 6 +++++- - .../WebKit/Source/modules/accessibility/AXLayoutObject.cpp | 2 +- - .../modules/canvas/canvas2d/BaseRenderingContext2D.cpp | 3 +++ - .../modules/canvas/canvas2d/CanvasRenderingContext2D.cpp | 6 +++++- - .../WebKit/Source/platform/graphics/ImageDataBuffer.cpp | 6 ++++-- - .../WebKit/Source/platform/graphics/ImageDataBuffer.h | 3 ++- + .../renderer/core/html/canvas/canvas_async_blob_creator.cc | 14 +++++++------- + .../renderer/core/html/canvas/canvas_async_blob_creator.h | 6 +++--- + .../blink/renderer/core/html/canvas/html_canvas_element.cc | 4 ++-- + .../blink/renderer/core/html/canvas/text_metrics.cc | 4 ++++ + third_party/blink/renderer/core/html/canvas/text_metrics.h | 2 ++ + .../blink/renderer/core/inspector/InspectorAuditsAgent.cpp | 2 +- + .../renderer/core/offscreencanvas/offscreen_canvas.cc | 6 +++++- + .../renderer/modules/accessibility/ax_layout_object.cc | 2 +- + .../modules/canvas/canvas2d/base_rendering_context_2d.cc | 3 +++ + .../modules/canvas/canvas2d/canvas_rendering_context_2d.cc | 6 +++++- + .../blink/renderer/platform/graphics/image_data_buffer.cc | 6 ++++-- + .../blink/renderer/platform/graphics/image_data_buffer.h | 3 ++- 12 files changed, 39 insertions(+), 19 deletions(-) -diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp b/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp ---- a/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp -+++ b/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp -@@ -220,14 +220,14 @@ void CanvasAsyncBlobCreator::Dispose() { +diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc +--- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc ++++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc +@@ -218,14 +218,14 @@ void CanvasAsyncBlobCreator::Dispose() { image_ = nullptr; } @@ -39,7 +39,7 @@ diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.c if (!static_bitmap_image_loaded_) { context_->GetTaskRunner(TaskType::kCanvasBlobSerialization) ->PostTask(FROM_HERE, -@@ -241,7 +241,7 @@ void CanvasAsyncBlobCreator::ScheduleAsyncBlobCreation(const double& quality) { +@@ -239,7 +239,7 @@ void CanvasAsyncBlobCreator::ScheduleAsyncBlobCreation(const double& quality) { // When OffscreenCanvas.convertToBlob() occurs on worker thread, // we do not need to use background task runner to reduce load on main. // So we just directly encode images on the worker thread. @@ -48,7 +48,7 @@ diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.c context_->GetTaskRunner(TaskType::kCanvasBlobSerialization) ->PostTask( FROM_HERE, -@@ -260,7 +260,7 @@ void CanvasAsyncBlobCreator::ScheduleAsyncBlobCreation(const double& quality) { +@@ -258,7 +258,7 @@ void CanvasAsyncBlobCreator::ScheduleAsyncBlobCreation(const double& quality) { BackgroundTaskRunner::PostOnBackgroundThread( FROM_HERE, CrossThreadBind(&CanvasAsyncBlobCreator::EncodeImageOnEncoderThread, @@ -57,7 +57,7 @@ diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.c } } else { idle_task_status_ = kIdleTaskNotStarted; -@@ -432,11 +432,11 @@ void CanvasAsyncBlobCreator::CreateNullAndReturnResult() { +@@ -430,11 +430,11 @@ void CanvasAsyncBlobCreator::CreateNullAndReturnResult() { Dispose(); } @@ -69,11 +69,11 @@ diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.c - if (!EncodeImage(quality)) { + if (!EncodeImage(quality, shuffleAmt)) { PostCrossThreadTask( - *parent_frame_task_runner_->Get(TaskType::kCanvasBlobSerialization), - FROM_HERE, -diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.h b/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.h ---- a/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.h -+++ b/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.h + *parent_frame_task_runner_, FROM_HERE, + CrossThreadBind(&CanvasAsyncBlobCreator::CreateNullAndReturnResult, +diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.h b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.h +--- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.h ++++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.h @@ -38,7 +38,7 @@ class CORE_EXPORT CanvasAsyncBlobCreator ExecutionContext*, ScriptPromiseResolver*); @@ -101,10 +101,10 @@ diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.h void IdleTaskStartTimeoutEvent(double quality); void IdleTaskCompleteTimeoutEvent(); -diff --git a/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.cpp b/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.cpp ---- a/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.cpp -+++ b/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.cpp -@@ -826,7 +826,7 @@ String HTMLCanvasElement::ToDataURLInternal( +diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +--- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc ++++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +@@ -850,7 +850,7 @@ String HTMLCanvasElement::ToDataURLInternal( std::unique_ptr data_buffer = ImageDataBuffer::Create(image_bitmap); if (data_buffer) @@ -113,7 +113,7 @@ diff --git a/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.cpp b/ } return String("data:,"); } -@@ -892,7 +892,7 @@ void HTMLCanvasElement::toBlob(V8BlobCallback* callback, +@@ -916,7 +916,7 @@ void HTMLCanvasElement::toBlob(V8BlobCallback* callback, } if (async_creator) { @@ -122,9 +122,9 @@ diff --git a/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.cpp b/ } else { GetDocument() .GetTaskRunner(TaskType::kCanvasBlobSerialization) -diff --git a/third_party/WebKit/Source/core/html/canvas/TextMetrics.cpp b/third_party/WebKit/Source/core/html/canvas/TextMetrics.cpp ---- a/third_party/WebKit/Source/core/html/canvas/TextMetrics.cpp -+++ b/third_party/WebKit/Source/core/html/canvas/TextMetrics.cpp +diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third_party/blink/renderer/core/html/canvas/text_metrics.cc +--- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc ++++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc @@ -47,6 +47,10 @@ float TextMetrics::GetFontBaseline(const TextBaseline& text_baseline, return 0; } @@ -136,9 +136,9 @@ diff --git a/third_party/WebKit/Source/core/html/canvas/TextMetrics.cpp b/third_ void TextMetrics::Update(const Font& font, const TextDirection& direction, const TextBaseline& baseline, -diff --git a/third_party/WebKit/Source/core/html/canvas/TextMetrics.h b/third_party/WebKit/Source/core/html/canvas/TextMetrics.h ---- a/third_party/WebKit/Source/core/html/canvas/TextMetrics.h -+++ b/third_party/WebKit/Source/core/html/canvas/TextMetrics.h +diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.h b/third_party/blink/renderer/core/html/canvas/text_metrics.h +--- a/third_party/blink/renderer/core/html/canvas/text_metrics.h ++++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h @@ -67,6 +67,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable { static float GetFontBaseline(const TextBaseline&, const FontMetrics&); @@ -148,9 +148,9 @@ diff --git a/third_party/WebKit/Source/core/html/canvas/TextMetrics.h b/third_pa private: void Update(const Font&, const TextDirection&, -diff --git a/third_party/WebKit/Source/core/inspector/InspectorAuditsAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorAuditsAgent.cpp ---- a/third_party/WebKit/Source/core/inspector/InspectorAuditsAgent.cpp -+++ b/third_party/WebKit/Source/core/inspector/InspectorAuditsAgent.cpp +diff --git a/third_party/blink/renderer/core/inspector/InspectorAuditsAgent.cpp b/third_party/blink/renderer/core/inspector/InspectorAuditsAgent.cpp +--- a/third_party/blink/renderer/core/inspector/InspectorAuditsAgent.cpp ++++ b/third_party/blink/renderer/core/inspector/InspectorAuditsAgent.cpp @@ -56,7 +56,7 @@ bool EncodeAsImage(char* body, String mime_type = "image/"; @@ -160,18 +160,18 @@ diff --git a/third_party/WebKit/Source/core/inspector/InspectorAuditsAgent.cpp b } } // namespace -diff --git a/third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.cpp b/third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.cpp ---- a/third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.cpp -+++ b/third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.cpp +diff --git a/third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.cc b/third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.cc +--- a/third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.cc ++++ b/third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.cc @@ -5,6 +5,7 @@ - #include "core/offscreencanvas/OffscreenCanvas.h" + #include "third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.h" #include +#include "base/rand_util.h" - #include "core/css/CSSFontSelector.h" - #include "core/css/OffscreenFontSelector.h" - #include "core/css/StyleEngine.h" -@@ -398,7 +399,10 @@ ScriptPromise OffscreenCanvas::convertToBlob(ScriptState* script_state, + #include + + #include "gpu/config/gpu_feature_info.h" +@@ -403,7 +404,10 @@ ScriptPromise OffscreenCanvas::convertToBlob(ScriptState* script_state, CanvasAsyncBlobCreator* async_creator = CanvasAsyncBlobCreator::Create( snapshot, encoding_mime_type, start_time, ExecutionContext::From(script_state), resolver); @@ -183,10 +183,10 @@ diff --git a/third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.cpp return resolver->Promise(); } else { exception_state.ThrowDOMException( -diff --git a/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp ---- a/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp -+++ b/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp -@@ -1017,7 +1017,7 @@ String AXLayoutObject::ImageDataUrl(const IntSize& max_size) const { +diff --git a/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc b/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc +--- a/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc ++++ b/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc +@@ -1009,7 +1009,7 @@ String AXLayoutObject::ImageDataUrl(const IntSize& max_size) const { if (!buffer) return String(); @@ -195,10 +195,10 @@ diff --git a/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp } String AXLayoutObject::GetText() const { -diff --git a/third_party/WebKit/Source/modules/canvas/canvas2d/BaseRenderingContext2D.cpp b/third_party/WebKit/Source/modules/canvas/canvas2d/BaseRenderingContext2D.cpp ---- a/third_party/WebKit/Source/modules/canvas/canvas2d/BaseRenderingContext2D.cpp -+++ b/third_party/WebKit/Source/modules/canvas/canvas2d/BaseRenderingContext2D.cpp -@@ -1610,6 +1610,9 @@ ImageData* BaseRenderingContext2D::getImageData( +diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc ++++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +@@ -1620,6 +1620,9 @@ ImageData* BaseRenderingContext2D::getImageData( const CanvasColorParams& color_params = ColorParams(); scoped_refptr snapshot = GetImage(kPreferNoAcceleration); @@ -208,10 +208,10 @@ diff --git a/third_party/WebKit/Source/modules/canvas/canvas2d/BaseRenderingCont if (!StaticBitmapImage::ConvertToArrayBufferContents( snapshot, contents, image_data_rect, color_params, IsAccelerated())) { exception_state.ThrowRangeError("Out of memory at ImageData creation"); -diff --git a/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.cpp b/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.cpp ---- a/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.cpp -+++ b/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.cpp -@@ -779,8 +779,12 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { +diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc ++++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +@@ -773,8 +773,12 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { else direction = ToTextDirection(GetState().GetDirection(), canvas()); @@ -225,10 +225,10 @@ diff --git a/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingCo } void CanvasRenderingContext2D::DrawTextInternal( -diff --git a/third_party/WebKit/Source/platform/graphics/ImageDataBuffer.cpp b/third_party/WebKit/Source/platform/graphics/ImageDataBuffer.cpp ---- a/third_party/WebKit/Source/platform/graphics/ImageDataBuffer.cpp -+++ b/third_party/WebKit/Source/platform/graphics/ImageDataBuffer.cpp -@@ -124,7 +124,9 @@ const unsigned char* ImageDataBuffer::Pixels() const { +diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc +--- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc ++++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc +@@ -118,7 +118,9 @@ const unsigned char* ImageDataBuffer::Pixels() const { bool ImageDataBuffer::EncodeImage(const String& mime_type, const double& quality, @@ -236,9 +236,9 @@ diff --git a/third_party/WebKit/Source/platform/graphics/ImageDataBuffer.cpp b/t Vector* encoded_image) const { + //TODO: this is the only place where shuffleAmt should be used DCHECK(is_valid_); - SkPixmap src; - if (uses_pixmap_) { -@@ -165,12 +167,12 @@ bool ImageDataBuffer::EncodeImage(const String& mime_type, + + if (mime_type == "image/jpeg") { +@@ -154,12 +156,12 @@ bool ImageDataBuffer::EncodeImage(const String& mime_type, } String ImageDataBuffer::ToDataURL(const String& mime_type, @@ -253,11 +253,11 @@ diff --git a/third_party/WebKit/Source/platform/graphics/ImageDataBuffer.cpp b/t return "data:,"; return "data:" + mime_type + ";base64," + Base64Encode(result); -diff --git a/third_party/WebKit/Source/platform/graphics/ImageDataBuffer.h b/third_party/WebKit/Source/platform/graphics/ImageDataBuffer.h ---- a/third_party/WebKit/Source/platform/graphics/ImageDataBuffer.h -+++ b/third_party/WebKit/Source/platform/graphics/ImageDataBuffer.h -@@ -51,9 +51,10 @@ class PLATFORM_EXPORT ImageDataBuffer { - const CanvasColorParams& = CanvasColorParams()); +diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.h b/third_party/blink/renderer/platform/graphics/image_data_buffer.h +--- a/third_party/blink/renderer/platform/graphics/image_data_buffer.h ++++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.h +@@ -47,9 +47,10 @@ class PLATFORM_EXPORT ImageDataBuffer { + scoped_refptr); static std::unique_ptr Create(const SkPixmap&); - String ToDataURL(const String& mime_type, const double& quality) const; diff --git a/patches/BRM053_Increase-maximum-connections-per-host-from-6-to-15.patch b/patches/BRM053_Increase-maximum-connections-per-host-from-6-to-15.patch deleted file mode 100644 index c8420a3a..00000000 --- a/patches/BRM053_Increase-maximum-connections-per-host-from-6-to-15.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Fri, 18 May 2018 10:10:00 +0200 -Subject: Increase maximum connections per host from 6 to 15 - ---- - net/socket/client_socket_pool_manager.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc ---- a/net/socket/client_socket_pool_manager.cc -+++ b/net/socket/client_socket_pool_manager.cc -@@ -41,7 +41,7 @@ static_assert(arraysize(g_max_sockets_per_pool) == - // be the same as the limit for ws. Also note that Firefox uses a limit of 200. - // See http://crbug.com/486800 - int g_max_sockets_per_group[] = { -- 6, // NORMAL_SOCKET_POOL -+ 15, // NORMAL_SOCKET_POOL - 255 // WEBSOCKET_SOCKET_POOL - }; - --- -2.7.4 -