OLD | NEW |
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-2016 Eyeo GmbH | 3 * Copyright (C) 2006-2016 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 12 matching lines...) Expand all Loading... |
23 #include "Thread.h" | 23 #include "Thread.h" |
24 #include "Utils.h" | 24 #include "Utils.h" |
25 #include "WebRequestJsObject.h" | 25 #include "WebRequestJsObject.h" |
26 | 26 |
27 namespace | 27 namespace |
28 { | 28 { |
29 class WebRequestThread : public AdblockPlus::Thread | 29 class WebRequestThread : public AdblockPlus::Thread |
30 { | 30 { |
31 public: | 31 public: |
32 WebRequestThread(AdblockPlus::JsEnginePtr jsEngine, AdblockPlus::JsValueList
& arguments) | 32 WebRequestThread(AdblockPlus::JsEnginePtr jsEngine, AdblockPlus::JsValueList
& arguments) |
33 : jsEngine(jsEngine), url(arguments[0]->AsString()) | 33 : Thread(true), jsEngine(jsEngine), url(arguments[0]->AsString()) |
34 { | 34 { |
35 if (!url.length()) | 35 if (!url.length()) |
36 throw std::runtime_error("Invalid string passed as first argument to GET
"); | 36 throw std::runtime_error("Invalid string passed as first argument to GET
"); |
37 | 37 |
38 { | 38 { |
39 AdblockPlus::JsValuePtr headersObj = arguments[1]; | 39 AdblockPlus::JsValuePtr headersObj = arguments[1]; |
40 if (!headersObj->IsObject()) | 40 if (!headersObj->IsObject()) |
41 throw std::runtime_error("Second argument to GET must be an object"); | 41 throw std::runtime_error("Second argument to GET must be an object"); |
42 | 42 |
43 std::vector<std::string> properties = headersObj->GetOwnPropertyNames(); | 43 std::vector<std::string> properties = headersObj->GetOwnPropertyNames(); |
(...skipping 27 matching lines...) Expand all Loading... |
71 for (AdblockPlus::HeaderList::iterator it = result.responseHeaders.begin()
; | 71 for (AdblockPlus::HeaderList::iterator it = result.responseHeaders.begin()
; |
72 it != result.responseHeaders.end(); ++it) | 72 it != result.responseHeaders.end(); ++it) |
73 { | 73 { |
74 headersObject->SetProperty(it->first, it->second); | 74 headersObject->SetProperty(it->first, it->second); |
75 } | 75 } |
76 resultObject->SetProperty("responseHeaders", headersObject); | 76 resultObject->SetProperty("responseHeaders", headersObject); |
77 | 77 |
78 AdblockPlus::JsValueList params; | 78 AdblockPlus::JsValueList params; |
79 params.push_back(resultObject); | 79 params.push_back(resultObject); |
80 callback->Call(params); | 80 callback->Call(params); |
81 delete this; | |
82 } | 81 } |
83 | 82 |
84 private: | 83 private: |
85 AdblockPlus::JsEnginePtr jsEngine; | 84 AdblockPlus::JsEnginePtr jsEngine; |
86 std::string url; | 85 std::string url; |
87 AdblockPlus::HeaderList headers; | 86 AdblockPlus::HeaderList headers; |
88 AdblockPlus::JsValuePtr callback; | 87 AdblockPlus::JsValuePtr callback; |
89 }; | 88 }; |
90 | 89 |
91 v8::Handle<v8::Value> GETCallback(const v8::Arguments& arguments) | 90 v8::Handle<v8::Value> GETCallback(const v8::Arguments& arguments) |
(...skipping 17 matching lines...) Expand all Loading... |
109 return v8::Undefined(); | 108 return v8::Undefined(); |
110 } | 109 } |
111 } | 110 } |
112 | 111 |
113 AdblockPlus::JsValuePtr AdblockPlus::WebRequestJsObject::Setup( | 112 AdblockPlus::JsValuePtr AdblockPlus::WebRequestJsObject::Setup( |
114 AdblockPlus::JsEnginePtr jsEngine, AdblockPlus::JsValuePtr obj) | 113 AdblockPlus::JsEnginePtr jsEngine, AdblockPlus::JsValuePtr obj) |
115 { | 114 { |
116 obj->SetProperty("GET", jsEngine->NewCallback(::GETCallback)); | 115 obj->SetProperty("GET", jsEngine->NewCallback(::GETCallback)); |
117 return obj; | 116 return obj; |
118 } | 117 } |
OLD | NEW |