Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/FilterEngine.cpp

Issue 5797488346791936: Issue 1107 - Support notifications (Closed)
Patch Set: simplify the expression Created Jan. 22, 2015, 7:54 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « libadblockplus.gyp ('k') | src/Notification.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 std::vector<SubscriptionPtr> FilterEngine::FetchAvailableSubscriptions() const 250 std::vector<SubscriptionPtr> FilterEngine::FetchAvailableSubscriptions() const
251 { 251 {
252 JsValuePtr func = jsEngine->Evaluate("API.getRecommendedSubscriptions"); 252 JsValuePtr func = jsEngine->Evaluate("API.getRecommendedSubscriptions");
253 JsValueList values = func->Call()->AsList(); 253 JsValueList values = func->Call()->AsList();
254 std::vector<SubscriptionPtr> result; 254 std::vector<SubscriptionPtr> result;
255 for (JsValueList::iterator it = values.begin(); it != values.end(); it++) 255 for (JsValueList::iterator it = values.begin(); it != values.end(); it++)
256 result.push_back(SubscriptionPtr(new Subscription(*it))); 256 result.push_back(SubscriptionPtr(new Subscription(*it)));
257 return result; 257 return result;
258 } 258 }
259 259
260 std::tr1::shared_ptr<Notification> FilterEngine::GetNextNotificationToShow(const std::string& url /*= std::string()*/)
261 {
262 JsValuePtr func = jsEngine->Evaluate("API.getNextNotificationToShow");
263 JsValueList params;
264 if (!url.empty())
265 {
266 params.push_back(jsEngine->NewValue(url));
267 }
268 return Notification::JsValueToNotification(func->Call(params));
269 }
270
260 AdblockPlus::FilterPtr FilterEngine::Matches(const std::string& url, 271 AdblockPlus::FilterPtr FilterEngine::Matches(const std::string& url,
261 ContentType contentType, 272 ContentType contentType,
262 const std::string& documentUrl) const 273 const std::string& documentUrl) const
263 { 274 {
264 std::vector<std::string> documentUrls; 275 std::vector<std::string> documentUrls;
265 documentUrls.push_back(documentUrl); 276 documentUrls.push_back(documentUrl);
266 return Matches(url, contentType, documentUrls); 277 return Matches(url, contentType, documentUrls);
267 } 278 }
268 279
269 AdblockPlus::FilterPtr FilterEngine::Matches(const std::string& url, 280 AdblockPlus::FilterPtr FilterEngine::Matches(const std::string& url,
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 } 415 }
405 416
406 int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2) 417 int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2)
407 { 418 {
408 JsValueList params; 419 JsValueList params;
409 params.push_back(jsEngine->NewValue(v1)); 420 params.push_back(jsEngine->NewValue(v1));
410 params.push_back(jsEngine->NewValue(v2)); 421 params.push_back(jsEngine->NewValue(v2));
411 JsValuePtr func = jsEngine->Evaluate("API.compareVersions"); 422 JsValuePtr func = jsEngine->Evaluate("API.compareVersions");
412 return func->Call(params)->AsInt(); 423 return func->Call(params)->AsInt();
413 } 424 }
OLDNEW
« no previous file with comments | « libadblockplus.gyp ('k') | src/Notification.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld