include/AdblockPlus/FilterEngine.h - Issue 10171027: Compile subscriptions.xml into the libadblockplus build and make itusable

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 10171027: Compile subscriptions.xml into the libadblockplus build and make itusable (Closed)

Patch Set: Created April 19, 2013, 7:59 a.m.

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

Jump to:

Index: include/AdblockPlus/FilterEngine.h

===================================================================

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

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

@@ -98,32 +98,31 @@ namespace AdblockPlus

Subscription(FilterEngine& filterEngine, const std::string& url);

#else

Subscription(JsValuePtr value);

#endif

};

typedef std::tr1::shared_ptr<Filter> FilterPtr;

typedef std::tr1::shared_ptr<Subscription> SubscriptionPtr;

- typedef void (*SubscriptionsCallback)(const std::vector<SubscriptionPtr>&);

class FilterEngine

{

#if FILTER_ENGINE_STUBS

friend class Filter;

friend class Subscription;

#endif

public:

explicit FilterEngine(JsEnginePtr jsEngine);

FilterPtr GetFilter(const std::string& text);

SubscriptionPtr GetSubscription(const std::string& url);

- const std::vector<FilterPtr> GetListedFilters() const;

- const std::vector<SubscriptionPtr> GetListedSubscriptions() const;

- void FetchAvailableSubscriptions(SubscriptionsCallback callback);

+ std::vector<FilterPtr> GetListedFilters() const;

+ std::vector<SubscriptionPtr> GetListedSubscriptions() const;

+ std::vector<SubscriptionPtr> FetchAvailableSubscriptions() const;

FilterPtr Matches(const std::string& url,

const std::string& contentType,

const std::string& documentUrl);

std::vector<std::string> GetElementHidingSelectors(const std::string& domain) const;

private:

JsEnginePtr jsEngine;

#if FILTER_ENGINE_STUBS