| 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-2017 eyeo GmbH | 3  * Copyright (C) 2006-2017 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 74       resultObject->SetProperty("responseStatus", result.responseStatus); | 74       resultObject->SetProperty("responseStatus", result.responseStatus); | 
| 75       resultObject->SetProperty("responseText", result.responseText); | 75       resultObject->SetProperty("responseText", result.responseText); | 
| 76 | 76 | 
| 77       AdblockPlus::JsValuePtr headersObject = jsEngine->NewObject(); | 77       AdblockPlus::JsValuePtr headersObject = jsEngine->NewObject(); | 
| 78       for (const auto& header : result.responseHeaders) | 78       for (const auto& header : result.responseHeaders) | 
| 79       { | 79       { | 
| 80         headersObject->SetProperty(header.first, header.second); | 80         headersObject->SetProperty(header.first, header.second); | 
| 81       } | 81       } | 
| 82       resultObject->SetProperty("responseHeaders", headersObject); | 82       resultObject->SetProperty("responseHeaders", headersObject); | 
| 83 | 83 | 
| 84       AdblockPlus::JsValueList params; | 84       AdblockPlus::JsConstValueList params; | 
| 85       params.push_back(resultObject); | 85       params.push_back(resultObject); | 
| 86       callback->Call(params); | 86       callback->Call(params); | 
| 87     } | 87     } | 
| 88 | 88 | 
| 89   private: | 89   private: | 
| 90     AdblockPlus::JsEnginePtr jsEngine; | 90     AdblockPlus::JsEnginePtr jsEngine; | 
| 91     std::string url; | 91     std::string url; | 
| 92     AdblockPlus::HeaderList headers; | 92     AdblockPlus::HeaderList headers; | 
| 93     AdblockPlus::JsValuePtr callback; | 93     AdblockPlus::JsValuePtr callback; | 
| 94   }; | 94   }; | 
| (...skipping 19 matching lines...) Expand all  Loading... | 
| 114     return v8::Undefined(); | 114     return v8::Undefined(); | 
| 115   } | 115   } | 
| 116 } | 116 } | 
| 117 | 117 | 
| 118 AdblockPlus::JsValuePtr AdblockPlus::WebRequestJsObject::Setup( | 118 AdblockPlus::JsValuePtr AdblockPlus::WebRequestJsObject::Setup( | 
| 119     AdblockPlus::JsEnginePtr jsEngine, AdblockPlus::JsValuePtr obj) | 119     AdblockPlus::JsEnginePtr jsEngine, AdblockPlus::JsValuePtr obj) | 
| 120 { | 120 { | 
| 121   obj->SetProperty("GET", jsEngine->NewCallback(::GETCallback)); | 121   obj->SetProperty("GET", jsEngine->NewCallback(::GETCallback)); | 
| 122   return obj; | 122   return obj; | 
| 123 } | 123 } | 
| OLD | NEW | 
|---|