mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Parse filters in API code

Browse source
This commit is contained in:
Cheng Zhao 2015-12-11 21:14:13 +08:00
parent 79a627014c
commit 67886cf513
4 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

24
atom/browser/api/atom_api_web_request.cc
View file

@ -15,6 +15,21 @@
using content::BrowserThread;
namespace mate {
template<>
struct Converter<extensions::URLPattern> {
static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
extensions::URLPattern* out) {
std::string pattern;
if (!ConvertFromV8(isolate, val, &pattern))
return false;
return out->Parse(pattern) == extensions::URLPattern::PARSE_SUCCESS;
}
};
} // namespace mate
namespace atom {
namespace api {
@ -28,9 +43,12 @@ WebRequest::~WebRequest() {
template<AtomNetworkDelegate::EventType type>
void WebRequest::SetListener(mate::Arguments* args) {
scoped_ptr<base::DictionaryValue> filter(new base::DictionaryValue);
args->GetNext(filter.get());
// { urls }.
URLPatterns patterns;
mate::Dictionary dict;
args->GetNext(&dict) && dict.Get("urls", &patterns);
// Function or null.
v8::Local<v8::Value> value;
AtomNetworkDelegate::Listener callback;
if (!args->GetNext(&callback) &&
@ -43,7 +61,7 @@ void WebRequest::SetListener(mate::Arguments* args) {
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
base::Bind(&AtomNetworkDelegate::SetListenerInIO,
base::Unretained(delegate),
type, base::Passed(&filter), callback));
type, patterns, callback));
}
// static