include/AdblockPlus/FilterEngine.h - Issue 29512648: Issue 5475 - Update adblockpluscore dependency to revision hg:b935a0402215

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: include/AdblockPlus/FilterEngine.h

Issue 29512648: Issue 5475 - Update adblockpluscore dependency to revision hg:b935a0402215 (Closed) Base URL: https://github.com/adblockplus/libadblockplus.git

Patch Set: Created Aug. 11, 2017, 12:36 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: include/AdblockPlus/FilterEngine.h

diff --git a/include/AdblockPlus/FilterEngine.h b/include/AdblockPlus/FilterEngine.h

index 9952be84abf73295b31723cf453190120b71798a..8a1f3ab6e5011bed5a0ad8a98475eed330340520 100644

--- a/include/AdblockPlus/FilterEngine.h

+++ b/include/AdblockPlus/FilterEngine.h

@@ -51,6 +51,7 @@ namespace AdblockPlus

enum Type {TYPE_BLOCKING, TYPE_EXCEPTION,

TYPE_ELEMHIDE, TYPE_ELEMHIDE_EXCEPTION,

+ TYPE_TYPE_ELEMHIDE_EMULATION,

sergei 2017/08/11 12:49:37 Meanwhile I have merely added this filter type to

TYPE_COMMENT, TYPE_INVALID};

/**

@@ -205,6 +206,8 @@ namespace AdblockPlus

CONTENT_TYPE_OBJECT = 16,

CONTENT_TYPE_SUBDOCUMENT = 32,

CONTENT_TYPE_DOCUMENT = 64,

+ CONTENT_TYPE_WEBSOCKET = 128,

+ CONTENT_TYPE_WEBRTC = 256,

sergei 2017/08/11 12:49:37 Tests will be done as #5499.

CONTENT_TYPE_PING = 1024,

CONTENT_TYPE_XMLHTTPREQUEST = 2048,

CONTENT_TYPE_OBJECT_SUBREQUEST = 4096,

« no previous file with comments | « dependencies ('k') | include/AdblockPlus/IFileSystem.h » ('j') | include/AdblockPlus/IFileSystem.h » ('J')