PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adblock update

Browse Source
This commit is contained in:
csagan5
2018-03-24 16:04:45 +01:00
parent 247247a8ae
commit 85a9737c16
4 changed files with 116 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/BRM024_Cure-AMP-and-tracking-from-search-results.patch
+11 -11
View File
@@ -5,9 +5,9 @@ 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/dont-track-me.h | 6 ++++++
.../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/dont-track-me.h
create mode 100644 third_party/WebKit/Source/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
@@ -27,7 +27,7 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi
#include "core/xml/parser/XMLDocumentParser.h"
#include "core/xml_names.h"
#include "core/xmlns_names.h"
+#include "extensions/dont-track-me.h"
+#include "extensions/anti_amp_cure.h"
#include "platform/CrossThreadFunctional.h"
#include "platform/DateComponents.h"
#include "platform/EventDispatchForbiddenScope.h"
@@ -48,26 +48,26 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi
+ size_t pos = domain.Find(".google.");
+ auto* bodyElement = body();
+ if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
+ LOG(INFO) << "injecting dont-track-me Javascript payload";
+ LOG(INFO) << "injecting anti-AMP-cure Javascript payload";
+ HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
+ e->setText(DONT_TRACK_ME_JS);
+ e->setText(ANTI_AMP_CURE_JS);
+ bodyElement->AppendChild(e);
+ }
+ }
}
void Document::ElementDataCacheClearTimerFired(TimerBase*) {
diff --git a/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h b/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h
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
new file mode 100644
--- /dev/null
+++ b/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h
+++ b/third_party/WebKit/Source/core/dom/extensions/anti_amp_cure.h
@@ -0,0 +1,6 @@
+#ifndef dont_track_me_h
+#define dont_track_me_h
+#ifndef anti_amp_cure_h
+#define anti_amp_cure_h
+
+#define DONT_TRACK_ME_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=<url>)\n // Mobile (/url?q=<url>)\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());\n}\n\nfunction setMlogoClick() {\n var mlogo = document.getElementById('mlogo');\n if (mlogo) {\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() {\n var saned = 0, total = 0;\n document.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// document.addEventListener('touchstart', handlePointerPress, true);\n sanitizeAll();\n}\nsetMlogoClick();\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=<url>)\n // Mobile (/url?q=<url>)\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());\n}\n\nfunction setMlogoClick() {\n var mlogo = document.getElementById('mlogo');\n if (mlogo) {\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() {\n var saned = 0, total = 0;\n document.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// document.addEventListener('touchstart', handlePointerPress, true);\n sanitizeAll();\n}\nsetMlogoClick();\n"
+
+#endif // dont_track_me_h
+#endif // anti_amp_cure_h
--
2.7.4
patches/BRM025_Play-videos-in-background.patch
+8 -8
View File
@@ -7,9 +7,9 @@ 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 ++++++
.../WebKit/Source/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/WebKit/Source/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
@@ -28,8 +28,8 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi
@@ -221,6 +221,7 @@
#include "core/xml_names.h"
#include "core/xmlns_names.h"
#include "extensions/dont-track-me.h"
+#include "extensions/video-bg-play.h"
#include "extensions/anti_amp_cure.h"
+#include "extensions/video_bg_play.h"
#include "platform/CrossThreadFunctional.h"
#include "platform/DateComponents.h"
#include "platform/EventDispatchForbiddenScope.h"
@@ -45,9 +45,9 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi
- auto* bodyElement = body();
- if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
+ if ((pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
LOG(INFO) << "injecting dont-track-me Javascript payload";
LOG(INFO) << "injecting anti-AMP-cure Javascript payload";
HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
e->setText(DONT_TRACK_ME_JS);
e->setText(ANTI_AMP_CURE_JS);
bodyElement->AppendChild(e);
}
- }
@@ -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/WebKit/Source/core/dom/extensions/video_bg_play.h b/third_party/WebKit/Source/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/WebKit/Source/core/dom/extensions/video_bg_play.h
@@ -0,0 +1,6 @@
+#ifndef video_bg_play_h
+#define video_bg_play_h
patches/BRM038_Bromite-adblock-engine.patch
+66 -28
View File
@@ -9,11 +9,11 @@ Add domain support
Ported from NoChromo patch
---
net/BUILD.gn | 2 +
net/url_request/adblock_entries.h | 63641 +++++++++++++++++++++++++++++++++
net/url_request/adblock_entries.h | 63679 +++++++++++++++++++++++++++++++++
net/url_request/adblock_intercept.cc | 163 +
net/url_request/adblock_intercept.h | 12 +
net/url_request/url_request.cc | 14 +-
5 files changed, 63831 insertions(+), 1 deletion(-)
5 files changed, 63869 insertions(+), 1 deletion(-)
create mode 100644 net/url_request/adblock_entries.h
create mode 100644 net/url_request/adblock_intercept.cc
create mode 100644 net/url_request/adblock_intercept.h
@@ -34,7 +34,7 @@ diff --git a/net/url_request/adblock_entries.h b/net/url_request/adblock_entries
new file mode 100644
--- /dev/null
+++ b/net/url_request/adblock_entries.h
@@ -0,0 +1,63641 @@
@@ -0,0 +1,63679 @@
+#ifndef NET_URL_REQUEST_ADBLOCK_ENTRIES_H_
+#define NET_URL_REQUEST_ADBLOCK_ENTRIES_H_
+
@@ -56,7 +56,7 @@ new file mode 100644
+ const char **domains, **domains_neg;
+};
+
+#define ADBLOCK_ENTRY_COUNT 31078
+#define ADBLOCK_ENTRY_COUNT 31096
+const char *m86785583[] = { "&AdType=" };
+const char *m427a18f5[] = { "&Ads_DFP=" };
+const char *m5def2b9b[] = { "&UrlAdParam=" };
@@ -1129,6 +1129,7 @@ new file mode 100644
+const char *m7589cd70[] = { ".social_tracking." };
+const char *m7509f4b[] = { ".space^" };
+const char *m2dc78978[] = { ".spacepools." };
+const char *d3f77dbda[] = { "spacepools.org" };
+const char *ma7603c1[] = { ".sponsorads." };
+const char *me55e4a30[] = { ".stats?action=" };
+const char *ma820ddcf[] = { ".streamads." };
@@ -1198,7 +1199,7 @@ new file mode 100644
+const char *m325c54b4[] = { "/!advert_" };
+const char *m8aa1c31b[] = { "/!crd_prm!." };
+const char *m2b8905ab[] = { "/([0-9]{1,3}\\.){3}[0-9]{1,3}/" };
+const char *dc878c3fa[] = { "0dt.net", "123movies.net", "animesonlinetk.info", "asianvote.com", "biqle.ru", "bmovies.to", "bonstreams.net", "briansarmiento.website", "bro.adca.st", "buzzfil.net", "clicknupload.org", "ddlvalley.me", "divxatope1.com", "dwatchseries.to", "ewatchseries.to", "fbstreams.me", "fileone.tv", "flash-x.tv", "flashsx.tv", "flashx.me", "flashx.run", "flashx.sx", "flashx.to", "flashx.tv", "flashx1.tv", "flashxx.tv", "gorillavid.in", "icefilms.info", "igg-games.com", "jkanime.net", "kissanime.ru", "lavamovies.se", "livecamtv.me", "mlbstream.me", "myfeed4u.me", "nbastreams.me", "newpct.com", "newpct1.com", "nflstreams.me", "nhlstreams.me", "nowvideo.sx", "opensubtitles.org", "pcgames-download.com", "pelispedia.tv", "pelisplus.tv", "pirateproxy.ist", "pirateproxy.sh", "putlockertv.se", "rapidvideo.com", "readmanga.today", "sawlive.tv", "serietvsubita.net", "skidrowcrack.com", "sportshd.me", "stream2watch.cc", "streamfilmzzz.com", "streamzzz.online", "strikeout.co", "subtorrents.io", "thehiddenbay.ws", "thepiratebay.cr", "thevideobee.to", "torrentz2.eu", "unblocked.sh", "unblocker.cc", "uptobox.com", "vidgg.to", "vidlox.me", "vidlox.tv", "vidtod.me", "vidup.me", "vidzi.tv", "vodlock.co", "watchers.to", "watchonline.to", "watchonlinemovies.com.pk", "yts.ag", "yts.am", "yts.gs" };
+const char *d6dd72ec5[] = { "0dt.net", "123movies.net", "animesonlinetk.info", "asianvote.com", "biqle.ru", "bmovies.to", "bonstreams.net", "briansarmiento.website", "bro.adca.st", "buzzfil.net", "clicknupload.org", "ddlvalley.me", "divxatope1.com", "dwatchseries.to", "ewatchseries.to", "fbstreams.me", "fileone.tv", "flash-x.tv", "flashsx.tv", "flashx.me", "flashx.run", "flashx.sx", "flashx.to", "flashx.tv", "flashx1.tv", "flashxx.tv", "gorillavid.in", "icefilms.info", "igg-games.com", "jkanime.net", "kissanime.ru", "lavamovies.se", "livecamtv.me", "mlbstream.me", "myfeed4u.me", "nbastreams.me", "newpct.com", "newpct1.com", "nflstreams.me", "nhlstreams.me", "nowvideo.sx", "opensubtitles.org", "pcgames-download.com", "pelispedia.tv", "pelisplus.tv", "pirateproxy.ist", "pirateproxy.sh", "putlockertv.se", "rapidvideo.com", "readmanga.today", "sawlive.tv", "serietvsubita.net", "skidrowcrack.com", "sportshd.me", "stream2watch.cc", "streamfilmzzz.com", "streamzzz.online", "strikeout.co", "subtorrents.io", "thehiddenbay.ws", "thepiratebay.cr", "thevideobee.to", "torrentz2.eu", "unblocked.sh", "unblocker.cc", "uptobox.com", "vidgg.to", "vidlox.me", "vidlox.tv", "vidtod.me", "vidup.me", "vidzi.tv", "vodlock.co", "watchers.to", "watchonline.to", "watchonlinemovies.com.pk", "yts.ag", "yts.am", "yts.gs", "zooqle.com" };
+const char *m70d6531c[] = { "/", ";sz=", ";ord=" };
+const char *d6facac8e[] = { "webhostingtalk.com" };
+const char *m96d08c60[] = { "/0.png?ver=" };
@@ -1932,7 +1933,7 @@ new file mode 100644
+const char *mf3956c2[] = { "/accAnal.js" };
+const char *m7040a6f0[] = { "/acc_random=" };
+const char *m613f6f8a[] = { "/acceptable." };
+const char *d414322dc[] = { "750g.com", "alibabuy.com", "allocine.fr", "cap-cine.fr", "chartsinfrance.net", "cotecine.fr", "easyvols.fr", "easyvoyage.com", "get-the-look.fr", "jeuxactu.com", "jeuxvideo.com", "lestream.fr", "millenium.org", "musiquemag.com", "ozap.com", "purebreak.com", "purepeople.com", "puretrend.com", "shopoon.fr", "terrafemina.com" };
+const char *d4341ab02[] = { "750g.com", "alibabuy.com", "allocine.fr", "cap-cine.fr", "chartsinfrance.net", "cotecine.fr", "easyvols.fr", "easyvoyage.com", "get-the-look.fr", "jeuxactu.com", "jeuxvideo.com", "lestream.fr", "millenium.org", "musiquemag.com", "ouest-france.fr", "ozap.com", "purebreak.com", "purepeople.com", "puretrend.com", "shopoon.fr", "terrafemina.com" };
+const char *maade70e4[] = { "/accesstracking/" };
+const char *maf7fc7e9[] = { "/acclog.cgi?" };
+const char *m9ef78dff[] = { "/ace.", "/?cookie" };
@@ -2990,6 +2991,7 @@ new file mode 100644
+const char *m7d9934e[] = { "/adheader." };
+const char *m78691568[] = { "/adheadertxt." };
+const char *m1913aec4[] = { "/adheading_" };
+const char *m7f560c17[] = { "/adhelper." };
+const char *mcd1697c0[] = { "/adhese." };
+const char *md228f185[] = { "/adhese_" };
+const char *mac49599c[] = { "/adhints/" };
@@ -3358,6 +3360,7 @@ new file mode 100644
+const char *ma06c3c0f[] = { "/ads-arc." };
+const char *m1ff6eef[] = { "/ads-banner" };
+const char *m203d14d5[] = { "/ads-blogs-" };
+const char *m53b0d666[] = { "/ads-cch-" };
+const char *meef5df56[] = { "/ads-common." };
+const char *me65dd101[] = { "/ads-config." };
+const char *mb73aff1b[] = { "/ads-foot." };
@@ -6486,6 +6489,7 @@ new file mode 100644
+const char *m41b02dfd[] = { "/ezoic/" };
+const char *m7bec029a[] = { "/ezoic/", ".gif?" };
+const char *m70ff4d57[] = { "/ezytrack." };
+const char *m1156ad60[] = { "/facash." };
+const char *mf04cbfe6[] = { "/facebookaff/" };
+const char *m14e73528[] = { "/facebookaff2/" };
+const char *m4d3797dc[] = { "/facebooksex." };
@@ -6507,6 +6511,7 @@ new file mode 100644
+const char *m43d9ef2d[] = { "/fbanalytics/" };
+const char *m7f2adfa1[] = { "/fbcounter/" };
+const char *mcd36e90d[] = { "/fbevents-amd.js" };
+const char *m59e910e8[] = { "/fbpixel." };
+const char *m8d123890[] = { "/fc_ads." };
+const char *m839b008a[] = { "/fe/track/" };
+const char *m3543649[] = { "/fea_ads." };
@@ -6515,6 +6520,8 @@ new file mode 100644
+const char *mb7286b72[] = { "/feedads." };
+const char *m46c9a9db[] = { "/fif.html?s=" };
+const char *mf3b5f608[] = { "/fifligatus." };
+const char *m39cdb210[] = { "/figanalytics." };
+const char *mfdcb1505[] = { "/figanalytics/" };
+const char *m2febb92a[] = { "/file/ad." };
+const char *me4ec2e94[] = { "/file/ads/" };
+const char *m9d6e356d[] = { "/fileadmin/ads/" };
@@ -6573,6 +6580,7 @@ new file mode 100644
+const char *mbec3aba5[] = { "/floatingad." };
+const char *m29adef8[] = { "/floatingads." };
+const char *me7871c93[] = { "/floaty_rotator" };
+const char *m3fcf88b7[] = { "/flowplayer.ads." };
+const char *ma58cf5e3[] = { "/flv-ad-" };
+const char *mffc7c88a[] = { "/flv_tracking." };
+const char *m96f635c4[] = { "/flvad_" };
@@ -8313,6 +8321,7 @@ new file mode 100644
+const char *mb045542a[] = { "/onedot.php?" };
+const char *m3db70590[] = { "/onesheet-ad-" };
+const char *m9839a43f[] = { "/onestat.js" };
+const char *m6fe03eca[] = { "/onfocus-tag." };
+const char *m61f86066[] = { "/online-ad_" };
+const char *m57e26da5[] = { "/online/ads/" };
+const char *m34fe2d95[] = { "/online_ads/" };
@@ -8641,6 +8650,7 @@ new file mode 100644
+const char *mf35ce944[] = { "/pladtrack." };
+const char *m10d8ef6[] = { "/planetstat." };
+const char *mbe0c9c9b[] = { "/play/ad/" };
+const char *me51f7fa8[] = { "/play?", "&refer=" };
+const char *ma2f831f0[] = { "/play?aver=" };
+const char *m4726080a[] = { "/play?refer=" };
+const char *m74344592[] = { "/player/ad/" };
@@ -9022,6 +9032,7 @@ new file mode 100644
+const char *m1f6a072[] = { "/reklame/" };
+const char *mcc8c1760[] = { "/related-ads." };
+const char *md25c9bf9[] = { "/relatedads." };
+const char *md0fd5e38[] = { "/releases/ads/" };
+const char *m836f390f[] = { "/relevance_ad." };
+const char *mafb85a39[] = { "/remoteTrackingManager.cfc?", "trackPage&" };
+const char *m3b9c0039[] = { "/remove-ads." };
@@ -9650,6 +9661,7 @@ new file mode 100644
+const char *m2a35b11c[] = { "/sstlm8.sst?" };
+const char *m901be05a[] = { "/st.aspx?" };
+const char *mb450fe25[] = { "/st_prebid.js" };
+const char *mbd5a3043[] = { "/standalone/ads-" };
+const char *mbf20fcfa[] = { "/standard_ads." };
+const char *m7d3e6da0[] = { "/stat-analytics/" };
+const char *m8191d92d[] = { "/stat.aspx?" };
@@ -13031,6 +13043,7 @@ new file mode 100644
+const char *maf7a91b1[] = { "adexchangecloud.com^" };
+const char *ma59bdb47[] = { "adexchangegate.com^" };
+const char *mdd909255[] = { "adexchangeguru.com^" };
+const char *ma56a2ec5[] = { "adexchangemachine.com^" };
+const char *mea5729[] = { "adexchangeprediction.com^" };
+const char *mc970023f[] = { "adexcite.com^" };
+const char *m52ffb9ed[] = { "adexpose.com^" };
@@ -13132,7 +13145,6 @@ new file mode 100644
+const char *m1bf29cf2[] = { "adman.gr/adman-video.js" };
+const char *dec08e7ba[] = { "alphatv.gr" };
+const char *m34c12879[] = { "adman.gr^" };
+const char *m4ecfb42c[] = { "adman.in.gr^" };
+const char *me6cba21e[] = { "adman.otenet.gr^" };
+const char *m3f2b1a5c[] = { "admanagement.ch^" };
+const char *m48bd3528[] = { "admanager.btopenworld.com^" };
@@ -13239,6 +13251,7 @@ new file mode 100644
+const char *mc85dfd63[] = { "adrazzi.com^" };
+const char *m2acd5f75[] = { "adreactor.com^" };
+const char *m1ffbea60[] = { "adreclaim.com^" };
+const char *m2b120abb[] = { "adrecover.com^" };
+const char *mf786cd48[] = { "adrecreate.com^" };
+const char *m132a4241[] = { "adremedy.com^" };
+const char *mad010c15[] = { "adreporting.com^" };
@@ -13530,6 +13543,7 @@ new file mode 100644
+const char *m1223c249[] = { "ads.nationalgeographic.com^" };
+const char *m52c9821d[] = { "ads.nationmedia.com/webfonts/" };
+const char *m9f67152[] = { "ads.ncm.com^" };
+const char *m5c9230cf[] = { "ads.ndtv1.com^" };
+const char *meb0e8c61[] = { "ads.netmechanic.com^" };
+const char *m3443916[] = { "ads.networksolutions.com^" };
+const char *m34b3ac63[] = { "ads.newdream.net^" };
@@ -14348,6 +14362,7 @@ new file mode 100644
+const char *m69dfe1fd[] = { "alotporn.com/media/banners/" };
+const char *mf1ef837[] = { "alotporn.com^", "^js^oopopw.js" };
+const char *m2aec37ee[] = { "alphabaseinc.com/images/display_adz/" };
+const char *m88dbeef5[] = { "alphaporno.com/", ".php" };
+const char *md2d9e4b0[] = { "alphasitebuilder.co.za/tracker/" };
+const char *mdb4f2ecd[] = { "alphonso.tv^" };
+const char *md52e3937[] = { "alpsat.com/banner/" };
@@ -15351,7 +15366,6 @@ new file mode 100644
+const char *m9b592df[] = { "banner.ad.nu^" };
+const char *m6c52ba30[] = { "banner.ambercoastcasino.com^" };
+const char *mf3eb734b[] = { "banner.automotiveworld.com^" };
+const char *mc3034288[] = { "banner.blogranking.net^" };
+const char *m8b308f82[] = { "banner.buempliz-online.ch^" };
+const char *m30ed56dd[] = { "banner.casino.net^" };
+const char *m4f3b18a6[] = { "banner.casinodelrio.com^" };
@@ -16862,7 +16876,6 @@ new file mode 100644
+const char *m536177d0[] = { "clipsyndicate.com/cs_api/cliplog?" };
+const char *m22336ee2[] = { "clixgalore.com^" };
+const char *me9d8f3f[] = { "clk.about.com^" };
+const char *m7d3ec757[] = { "clk.konflab.com^" };
+const char *m8c27c363[] = { "clk.onet.pl^" };
+const char *m4f28cd7a[] = { "clkads.com^" };
+const char *m5a3d93f1[] = { "clkrev.com^" };
@@ -17160,6 +17173,7 @@ new file mode 100644
+const char *daab4423b[] = { "pornhub.com", "redtube.com.br", "tube8.com", "tube8.es", "tube8.fr", "xtube.com", "youporn.com", "youporngay.com" };
+const char *m14019559[] = { "comeadvertisewithus.com^" };
+const char *dbec56c7c[] = { "thecountrycaller.com", "thefreethoughtproject.com" };
+const char *m342e8d61[] = { "comegarage.com^" };
+const char *m76936da8[] = { "comet.ibsrv.net^" };
+const char *m77bad2db[] = { "comic-rocket.com/metrics.js" };
+const char *m2cd74cb[] = { "comicbookmovie.com/plugins/ads/" };
@@ -17270,7 +17284,7 @@ new file mode 100644
+const char *m1dee7c77[] = { "converse.tm-awx.com^" };
+const char *mfa6c14c0[] = { "conversionruler.com^" };
+const char *m995de05[] = { "convertmyimage.com/images/banner-square.png" };
+const char *m3be43128[] = { "conviva.com^" };
+const char *m7502b1c9[] = { "convrse.media^" };
+const char *mdce4e871[] = { "conwaydailysun.com/images/Tiles_Skyscrapers/" };
+const char *mcf86276[] = { "conwaydailysun.com/images/banners/" };
+const char *m2eb0f828[] = { "cookies.cmpnet.com^" };
@@ -17687,7 +17701,6 @@ new file mode 100644
+const char *m791d99dc[] = { "d24n15hnbwhuhn.cloudfront.net/libs/amplitude-" };
+const char *m3205f48c[] = { "d258j801nsw1p7.cloudfront.net^" };
+const char *m6423a217[] = { "d25ezbwokoefx6.cloudfront.net^" };
+const char *ded2b7cc4[] = { "trueachievements.com" };
+const char *mc876079a[] = { "d25ruj6ht8bs1.cloudfront.net^" };
+const char *m57a1d4db[] = { "d25xkbr68qqtcn.cloudfront.net^" };
+const char *m1c0971be[] = { "d26dzd2k67we08.cloudfront.net^" };
@@ -19380,6 +19393,7 @@ new file mode 100644
+const char *m5254dd82[] = { "fccbrea.org/javascript/stats.js" };
+const char *m9406e08[] = { "fccbrea.org^", "^swfaddress.js" };
+const char *m3450bbae[] = { "fckya.com/lj.js" };
+const char *m9ff3889[] = { "fcportables.com^" };
+const char *m45d40b2a[] = { "feed-reader.net/tracking.php" };
+const char *m2425d8e6[] = { "feed-the-beast.com^", "^gamevox.png" };
+const char *m20210de2[] = { "feed.informer.com/fdstats" };
@@ -20111,7 +20125,6 @@ new file mode 100644
+const char *m3436bdba[] = { "gateways.s3.amazonaws.com^" };
+const char *m269633f6[] = { "gather.hankyung.com^" };
+const char *m1f026e4b[] = { "gatheringmagic.com/wp-content/plugins/bwp-minify/min/", "/google-analyticator/" };
+const char *m7506f945[] = { "gator.com^" };
+const char *me2a28ed3[] = { "gawker.com/?op=hyperion_useragent_data" };
+const char *m25d758ca[] = { "gawker.com/at.js.php" };
+const char *me6dea707[] = { "gawker.com^", "^trackers.html" };
@@ -20591,6 +20604,7 @@ new file mode 100644
+const char *mc10dcbcd[] = { "googlesyndication.com^", "^simgad^" };
+const char *m11e125bc[] = { "googletagmanager.com/gtag/js" };
+const char *ma41dd4d4[] = { "googletagmanager.com/gtm.js" };
+const char *d4cd4828d[] = { "netcombo.com.br", "saraiva.com.br", "tugatech.com.pt" };
+const char *me7abf845[] = { "googletagmanager.com/gtm.js?" };
+const char *d3fde7f18[] = { "sportmaster.ru" };
+const char *m32e02b79[] = { "googletagmanager.com/gtm.js?id=" };
@@ -20650,6 +20664,7 @@ new file mode 100644
+const char *m38338e18[] = { "graboid.com/affiliates/" };
+const char *m6a656da0[] = { "graduateinjapan.com/affiliates/" };
+const char *m4c27736e[] = { "grafstat.ro^" };
+const char *mf0ebbe66[] = { "grahamdigital.com^" };
+const char *mc24a0d67[] = { "grannysexforum.com/filter.php" };
+const char *m99093968[] = { "grapeshot.co.uk/sare-api/" };
+const char *maff6ae36[] = { "grapeshot.co.uk^" };
@@ -22241,6 +22256,7 @@ new file mode 100644
+const char *db71d48f7[] = { "vidspot.net" };
+const char *m9e949232[] = { "jwpsrv.com^" };
+const char *m2e2c3fdb[] = { "jyllands-posten.dk/js/ads.js" };
+const char *ma23a878[] = { "jzfzjss.com^" };
+const char *m7dcb5737[] = { "jzrputtbut.net^", "^name^" };
+const char *mf841c0b7[] = { "k-files.de/screen.js" };
+const char *m920b6a34[] = { "k-foren.de/screen.js" };
@@ -23752,7 +23768,6 @@ new file mode 100644
+const char *d4d5ae822[] = { "cc.com" };
+const char *m6d66a9ad[] = { "moatads.com^" };
+const char *m80fa34b3[] = { "mob.org/banner/" };
+const char *ma9a18c71[] = { "mob.system-onlline.com^" };
+const char *mc0b7e180[] = { "mobclix.com^" };
+const char *m6cb03d8d[] = { "mobilcom-debitel.de/track/" };
+const char *m469f26b8[] = { "mobilefish.com/scripts/advertisement.js" };
@@ -25839,6 +25854,7 @@ new file mode 100644
+const char *m645eeeb6[] = { "pixel.tree.com^" };
+const char *m38f237c7[] = { "pixel.usrsync.com^" };
+const char *m119c040[] = { "pixel.vmm-satellite2.com^" };
+const char *m94e9cc76[] = { "pixel.watch^" };
+const char *m9145e555[] = { "pixel.wp.com^" };
+const char *me724f9e1[] = { "pixel.yabidos.com^" };
+const char *m63854691[] = { "pixel.yola.com^" };
@@ -26190,6 +26206,7 @@ new file mode 100644
+const char *mc26a1c26[] = { "porntalk.com/img/banners/" };
+const char *m284e9e2f[] = { "porntalk.com/rec/" };
+const char *md54cf414[] = { "porntrack.com^" };
+const char *mac9dbcda[] = { "porntube.com/", ".php" };
+const char *m221ae038[] = { "porntube.com/", ".php?z=" };
+const char *mb32b6100[] = { "porntube.com/adb/" };
+const char *mf32865a[] = { "porntube.com/ads" };
@@ -30030,6 +30047,7 @@ new file mode 100644
+const char *mb5abadaa[] = { "track.uniqodo.com^" };
+const char *mac5e71d0[] = { "track.untd.com^" };
+const char *m402f81bd[] = { "track.veedio.it^" };
+const char *m51ef431b[] = { "track.viewdeos.com^" };
+const char *mc57e1cbf[] = { "track.vscash.com^" };
+const char *mc5c6a749[] = { "track.webgains.com^" };
+const char *m59c51af5[] = { "track.websiteceo.com^" };
@@ -30041,6 +30059,7 @@ new file mode 100644
+const char *mfe16f294[] = { "track.youniversalmedia.com^" };
+const char *m2e1d6993[] = { "track.zalando." };
+const char *mb120ff57[] = { "track.zomato.com^" };
+const char *m12b60d68[] = { "track1.viewdeos.com^" };
+const char *m9e3b62a1[] = { "track2.dulingo.com^" };
+const char *m2c388c98[] = { "track2.mycliplister.com^" };
+const char *mcd848c35[] = { "track2.royalmail.com^" };
@@ -30919,6 +30938,8 @@ new file mode 100644
+const char *m4ca2b8a9[] = { "verdict.abc.go.com^" };
+const char *m6ad94daa[] = { "vergol.com/", "/ads.js" };
+const char *mdb9831b7[] = { "vergol.com/", "adblock.js" };
+const char *m582c8bad[] = { "vergol.com/player/ads.js" };
+const char *d143d3e80[] = { "verliga.net" };
+const char *m204c2efc[] = { "vericlick.com^" };
+const char *m28c4a84b[] = { "verizon.com/ads/" };
+const char *mec56a3d8[] = { "verizonwireless.com/mpel.js?" };
@@ -31688,7 +31709,6 @@ new file mode 100644
+const char *mc78e2979[] = { "widget.crowdignite.com^" };
+const char *m672cd1fc[] = { "widget.directory.dailycommercial.com^" };
+const char *m7c47a90c[] = { "widget.engageya.com/engageya_loader.js" };
+const char *m7c6dd832[] = { "widget.intercom.io^" };
+const char *ma43441dd[] = { "widget.kelkoo.com^" };
+const char *mefb86be7[] = { "widget.perfectmarket.com^" };
+const char *me115ccea[] = { "widget.quantcast.com^" };
@@ -33633,7 +33653,7 @@ new file mode 100644
+ { 1, m8f77e91a, 0, 1, 0, d98789ae5, NULL },
+ { 1, m7589cd70, 0, 0, 0, NULL, NULL },
+ { 1, m7509f4b, ADBLOCK_FLAG_HAS_SEPARATOR, 9, 0, daed18dd1, NULL },
+ { 1, m2dc78978, 0, 0, 0, NULL, NULL },
+ { 1, m2dc78978, 0, 1, 0, d3f77dbda, NULL },
+ { 1, ma7603c1, 0, 0, 0, NULL, NULL },
+ { 1, me55e4a30, 0, 0, 0, NULL, NULL },
+ { 1, ma820ddcf, 0, 0, 0, NULL, NULL },
@@ -33700,7 +33720,7 @@ new file mode 100644
+ { 1, m5f28c3be, 0, 0, 0, NULL, NULL },
+ { 1, m325c54b4, 0, 0, 0, NULL, NULL },
+ { 1, m8aa1c31b, 0, 0, 0, NULL, NULL },
+ { 1, m2b8905ab, 0, 79, 0, dc878c3fa, NULL },
+ { 1, m2b8905ab, 0, 80, 0, d6dd72ec5, NULL },
+ { 3, m70d6531c, ADBLOCK_FLAG_HAS_WILDCARD, 1, 0, d6facac8e, NULL },
+ { 1, m96d08c60, 0, 0, 0, NULL, NULL },
+ { 1, md676e360, 0, 0, 0, NULL, NULL },
@@ -34426,7 +34446,7 @@ new file mode 100644
+ { 1, m73c664e2, 0, 0, 0, NULL, NULL },
+ { 1, mf3956c2, 0, 0, 0, NULL, NULL },
+ { 1, m7040a6f0, 0, 0, 0, NULL, NULL },
+ { 1, m613f6f8a, 0, 20, 0, d414322dc, NULL },
+ { 1, m613f6f8a, 0, 21, 0, d4341ab02, NULL },
+ { 1, maade70e4, 0, 0, 0, NULL, NULL },
+ { 1, maf7fc7e9, 0, 0, 0, NULL, NULL },
+ { 2, m9ef78dff, ADBLOCK_FLAG_HAS_WILDCARD, 0, 0, NULL, NULL },
@@ -35461,6 +35481,7 @@ new file mode 100644
+ { 1, m7d9934e, 0, 0, 0, NULL, NULL },
+ { 1, m78691568, 0, 0, 0, NULL, NULL },
+ { 1, m1913aec4, 0, 0, 0, NULL, NULL },
+ { 1, m7f560c17, 0, 0, 0, NULL, NULL },
+ { 1, mcd1697c0, 0, 0, 0, NULL, NULL },
+ { 1, md228f185, 0, 0, 0, NULL, NULL },
+ { 1, mac49599c, 0, 0, 0, NULL, NULL },
@@ -35802,6 +35823,7 @@ new file mode 100644
+ { 1, ma06c3c0f, 0, 0, 0, NULL, NULL },
+ { 1, m1ff6eef, 0, 0, 0, NULL, NULL },
+ { 1, m203d14d5, 0, 0, 0, NULL, NULL },
+ { 1, m53b0d666, 0, 0, 0, NULL, NULL },
+ { 1, meef5df56, 0, 0, 0, NULL, NULL },
+ { 1, me65dd101, 0, 0, 0, NULL, NULL },
+ { 1, mb73aff1b, 0, 0, 0, NULL, NULL },
@@ -37414,8 +37436,8 @@ new file mode 100644
+ { 1, mc6e6ddb4, 0, 0, 0, NULL, NULL },
+ { 1, m518a83a7, 0, 0, 0, NULL, NULL },
+ { 1, m4a0a6df4, 0, 0, 0, NULL, NULL },
+ { 1, m120a0aee, 0, 20, 0, d414322dc, NULL },
+ { 1, ma59f4eec, 0, 20, 0, d414322dc, NULL },
+ { 1, m120a0aee, 0, 21, 0, d4341ab02, NULL },
+ { 1, ma59f4eec, 0, 21, 0, d4341ab02, NULL },
+ { 1, m5ecde469, 0, 0, 0, NULL, NULL },
+ { 1, m60a013c3, 0, 0, 0, NULL, NULL },
+ { 1, md83535ce, 0, 0, 0, NULL, NULL },
@@ -38863,6 +38885,7 @@ new file mode 100644
+ { 1, m41b02dfd, 0, 0, 0, NULL, NULL },
+ { 2, m7bec029a, ADBLOCK_FLAG_HAS_WILDCARD, 0, 0, NULL, NULL },
+ { 1, m70ff4d57, 0, 0, 0, NULL, NULL },
+ { 1, m1156ad60, 0, 0, 0, NULL, NULL },
+ { 1, mf04cbfe6, 0, 0, 0, NULL, NULL },
+ { 1, m14e73528, 0, 0, 0, NULL, NULL },
+ { 1, m4d3797dc, 0, 0, 0, NULL, NULL },
@@ -38882,6 +38905,7 @@ new file mode 100644
+ { 1, m43d9ef2d, 0, 0, 0, NULL, NULL },
+ { 1, m7f2adfa1, 0, 0, 0, NULL, NULL },
+ { 1, mcd36e90d, 0, 0, 0, NULL, NULL },
+ { 1, m59e910e8, 0, 0, 0, NULL, NULL },
+ { 1, m8d123890, 0, 0, 0, NULL, NULL },
+ { 1, m839b008a, 0, 0, 0, NULL, NULL },
+ { 1, m3543649, 0, 0, 0, NULL, NULL },
@@ -38890,6 +38914,8 @@ new file mode 100644
+ { 1, mb7286b72, 0, 0, 0, NULL, NULL },
+ { 1, m46c9a9db, 0, 0, 0, NULL, NULL },
+ { 1, mf3b5f608, 0, 0, 0, NULL, NULL },
+ { 1, m39cdb210, 0, 0, 0, NULL, NULL },
+ { 1, mfdcb1505, 0, 0, 0, NULL, NULL },
+ { 1, m2febb92a, 0, 0, 0, NULL, NULL },
+ { 1, me4ec2e94, 0, 0, 0, NULL, NULL },
+ { 1, m9d6e356d, 0, 0, 0, NULL, NULL },
@@ -38946,6 +38972,7 @@ new file mode 100644
+ { 1, mbec3aba5, 0, 0, 0, NULL, NULL },
+ { 1, m29adef8, 0, 0, 0, NULL, NULL },
+ { 1, me7871c93, 0, 0, 0, NULL, NULL },
+ { 1, m3fcf88b7, 0, 0, 0, NULL, NULL },
+ { 1, ma58cf5e3, 0, 0, 0, NULL, NULL },
+ { 1, mffc7c88a, 0, 0, 0, NULL, NULL },
+ { 1, m96f635c4, 0, 0, 0, NULL, NULL },
@@ -40674,6 +40701,7 @@ new file mode 100644
+ { 1, mb045542a, 0, 0, 0, NULL, NULL },
+ { 1, m3db70590, 0, 0, 0, NULL, NULL },
+ { 1, m9839a43f, 0, 0, 0, NULL, NULL },
+ { 1, m6fe03eca, 0, 0, 0, NULL, NULL },
+ { 1, m61f86066, 0, 0, 0, NULL, NULL },
+ { 1, m57e26da5, 0, 0, 0, NULL, NULL },
+ { 1, m34fe2d95, 0, 0, 0, NULL, NULL },
@@ -40995,6 +41023,7 @@ new file mode 100644
+ { 1, mf35ce944, 0, 0, 0, NULL, NULL },
+ { 1, m10d8ef6, 0, 0, 0, NULL, NULL },
+ { 1, mbe0c9c9b, 0, 0, 0, NULL, NULL },
+ { 2, me51f7fa8, ADBLOCK_FLAG_HAS_WILDCARD, 0, 0, NULL, NULL },
+ { 1, ma2f831f0, 0, 0, 0, NULL, NULL },
+ { 1, m4726080a, 0, 0, 0, NULL, NULL },
+ { 1, m74344592, 0, 0, 0, NULL, NULL },
@@ -41371,6 +41400,7 @@ new file mode 100644
+ { 1, m1f6a072, 0, 0, 0, NULL, NULL },
+ { 1, mcc8c1760, 0, 0, 0, NULL, NULL },
+ { 1, md25c9bf9, 0, 0, 0, NULL, NULL },
+ { 1, md0fd5e38, 0, 0, 0, NULL, NULL },
+ { 1, m836f390f, 0, 0, 0, NULL, NULL },
+ { 2, mafb85a39, ADBLOCK_FLAG_HAS_WILDCARD, 0, 0, NULL, NULL },
+ { 1, m3b9c0039, 0, 0, 0, NULL, NULL },
@@ -41993,6 +42023,7 @@ new file mode 100644
+ { 1, m2a35b11c, 0, 0, 0, NULL, NULL },
+ { 1, m901be05a, 0, 0, 0, NULL, NULL },
+ { 1, mb450fe25, 0, 0, 0, NULL, NULL },
+ { 1, mbd5a3043, 0, 0, 0, NULL, NULL },
+ { 1, mbf20fcfa, 0, 0, 0, NULL, NULL },
+ { 1, m7d3e6da0, 0, 0, 0, NULL, NULL },
+ { 1, m8191d92d, 0, 0, 0, NULL, NULL },
@@ -45262,6 +45293,7 @@ new file mode 100644
+ { 1, maf7a91b1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, ma59bdb47, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mdd909255, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, ma56a2ec5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mea5729, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mc970023f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m52ffb9ed, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
@@ -45356,7 +45388,6 @@ new file mode 100644
+ { 1, mc01d39a9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m1bf29cf2, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, 1, 0, dec08e7ba, NULL },
+ { 1, m34c12879, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m4ecfb42c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, me6cba21e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m3f2b1a5c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m48bd3528, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
@@ -45449,6 +45480,7 @@ new file mode 100644
+ { 1, mc85dfd63, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m2acd5f75, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m1ffbea60, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m2b120abb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mf786cd48, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m132a4241, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mad010c15, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
@@ -45724,6 +45756,7 @@ new file mode 100644
+ { 1, m1223c249, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m52c9821d, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, m9f67152, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m5c9230cf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, meb0e8c61, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m3443916, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m34b3ac63, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
@@ -46470,6 +46503,7 @@ new file mode 100644
+ { 1, m69dfe1fd, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 2, mf1ef837, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m2aec37ee, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 2, m88dbeef5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, 0, 0, NULL, NULL },
+ { 1, md2d9e4b0, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, mdb4f2ecd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, md52e3937, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
@@ -47383,7 +47417,6 @@ new file mode 100644
+ { 1, m9b592df, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m6c52ba30, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mf3eb734b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mc3034288, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m8b308f82, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m30ed56dd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m4f3b18a6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
@@ -48799,7 +48832,6 @@ new file mode 100644
+ { 1, m536177d0, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, m22336ee2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, me9d8f3f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m7d3ec757, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m8c27c363, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m4f28cd7a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m5a3d93f1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
@@ -49053,6 +49085,7 @@ new file mode 100644
+ { 1, m7f8a004, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 2, mc92a42cb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, 8, 0, daab4423b, NULL },
+ { 1, m14019559, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 2, 0, dbec56c7c, NULL },
+ { 1, m342e8d61, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m76936da8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m77bad2db, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, m2cd74cb, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
@@ -49156,7 +49189,7 @@ new file mode 100644
+ { 1, m1dee7c77, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mfa6c14c0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m995de05, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, m3be43128, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m7502b1c9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mdce4e871, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, mcf86276, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, m2eb0f828, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
@@ -49563,7 +49596,7 @@ new file mode 100644
+ { 1, m1b40aa4d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m791d99dc, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, 1, 0, dd9e6a333, NULL },
+ { 1, m3205f48c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m6423a217, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 1, 0, ded2b7cc4, NULL },
+ { 1, m6423a217, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mc876079a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m57a1d4db, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m1c0971be, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
@@ -51139,6 +51172,7 @@ new file mode 100644
+ { 1, m5254dd82, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 2, m9406e08, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m3450bbae, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, m9ff3889, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m45d40b2a, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 2, m2425d8e6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m20210de2, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
@@ -51835,7 +51869,6 @@ new file mode 100644
+ { 1, m3436bdba, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m269633f6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 2, m1f026e4b, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, 0, 0, NULL, NULL },
+ { 1, m7506f945, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, me2a28ed3, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, m25d758ca, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 2, me6dea707, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
@@ -52259,7 +52292,7 @@ new file mode 100644
+ { 2, m3f7fdfe3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 2, mc10dcbcd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m11e125bc, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, 2, 0, dfa2f7a26, NULL },
+ { 1, ma41dd4d4, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, 1, 0, d74e80f7c, NULL },
+ { 1, ma41dd4d4, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, 3, 0, d4cd4828d, NULL },
+ { 1, ma41dd4d4, ADBLOCK_FLAG_MATCH_DOMAIN, 1, 0, dbc00704d, NULL },
+ { 1, me7abf845, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, 1, 0, d3fde7f18, NULL },
+ { 1, me7abf845, ADBLOCK_FLAG_MATCH_DOMAIN, 1, 0, d74c71641, NULL },
@@ -52316,6 +52349,7 @@ new file mode 100644
+ { 1, m38338e18, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, m6a656da0, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, m4c27736e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mf0ebbe66, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mc24a0d67, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, m99093968, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, maff6ae36, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
@@ -53814,6 +53848,7 @@ new file mode 100644
+ { 1, m8455d9ab, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, 1, 0, db71d48f7, NULL },
+ { 1, m9e949232, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 3, 0, d79d43575, NULL },
+ { 1, m2e2c3fdb, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, ma23a878, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 2, m7dcb5737, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mf841c0b7, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, m920b6a34, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
@@ -55254,7 +55289,6 @@ new file mode 100644
+ { 1, mac8cbe0e, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, 1, 0, d4d5ae822, NULL },
+ { 1, m6d66a9ad, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m80fa34b3, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, ma9a18c71, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mc0b7e180, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m6cb03d8d, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, m469f26b8, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
@@ -57222,6 +57256,7 @@ new file mode 100644
+ { 1, m645eeeb6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m38f237c7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m119c040, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m94e9cc76, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m9145e555, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, me724f9e1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m63854691, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
@@ -57550,6 +57585,7 @@ new file mode 100644
+ { 1, mc26a1c26, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, m284e9e2f, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, md54cf414, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 2, mac9dbcda, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, 0, 0, NULL, NULL },
+ { 2, m221ae038, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, 0, 0, NULL, NULL },
+ { 1, mb32b6100, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, mf32865a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_MATCH_END, 0, 0, NULL, NULL },
@@ -61215,6 +61251,7 @@ new file mode 100644
+ { 1, mb5abadaa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mac5e71d0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m402f81bd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m51ef431b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mc57e1cbf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mc5c6a749, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m59c51af5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
@@ -61226,6 +61263,7 @@ new file mode 100644
+ { 1, mfe16f294, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m2e1d6993, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, mb120ff57, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m12b60d68, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m9e3b62a1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m2c388c98, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mcd848c35, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
@@ -62070,6 +62108,7 @@ new file mode 100644
+ { 1, m4ca2b8a9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 2, m6ad94daa, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, 0, 0, NULL, NULL },
+ { 2, mdb9831b7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, 0, 0, NULL, NULL },
+ { 1, m582c8bad, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, 1, 0, d143d3e80, NULL },
+ { 1, m204c2efc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m28c4a84b, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, mec56a3d8, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
@@ -62815,7 +62854,6 @@ new file mode 100644
+ { 1, mc78e2979, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m672cd1fc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, m7c47a90c, ADBLOCK_FLAG_MATCH_DOMAIN, 0, 0, NULL, NULL },
+ { 1, m7c6dd832, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, ma43441dd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, mefb86be7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
+ { 1, me115ccea, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, 0, 0, NULL, NULL },
patches/BRM042_Canvas-disable-toDataURL-and-toBlob.patch
+31 -1
View File
@@ -4,7 +4,8 @@ Subject: Canvas: disable toDataURL and toBlob
---
.../Source/core/html/canvas/HTMLCanvasElement.cpp | 71 ----------------------
1 file changed, 71 deletions(-)
.../canvas/canvas2d/CanvasRenderingContext2D.cpp | 19 +-----
2 files changed, 1 insertion(+), 89 deletions(-)
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
@@ -101,6 +102,35 @@ diff --git a/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.cpp b/
}
void HTMLCanvasElement::AddListener(CanvasDrawListener* listener) {
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
@@ -758,24 +758,7 @@ void CanvasRenderingContext2D::strokeText(const String& text,
}
TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
- // The style resolution required for fonts is not available in frame-less
- // documents.
- if (!canvas()->GetDocument().GetFrame())
- return TextMetrics::Create();
-
- canvas()->GetDocument().UpdateStyleAndLayoutTreeForNode(canvas());
-
- const Font& font = AccessFont();
-
- TextDirection direction;
- if (GetState().GetDirection() ==
- CanvasRenderingContext2DState::kDirectionInherit)
- direction = DetermineDirectionality(text);
- else
- direction = ToTextDirection(GetState().GetDirection(), canvas());
-
- return TextMetrics::Create(font, direction, GetState().GetTextBaseline(),
- GetState().GetTextAlign(), text);
+ return TextMetrics::Create();
}
void CanvasRenderingContext2D::DrawTextInternal(
--
2.7.4