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

Side by Side Diff: src/GlobalJsObject.cpp

Issue 29369557: Issue #4692 - Rewrite I/O tasks to avoid engine self-reference
Patch Set: Created Dec. 28, 2016, 5:34 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 | « src/FileSystemJsObject.cpp ('k') | src/JsEngine.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-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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 converted.erase(converted.begin()); 140 converted.erase(converted.begin());
141 jsEngine->TriggerEvent(eventName, converted); 141 jsEngine->TriggerEvent(eventName, converted);
142 return v8::Undefined(); 142 return v8::Undefined();
143 } 143 }
144 } 144 }
145 145
146 JsValuePtr AdblockPlus::GlobalJsObject::Setup(JsEnginePtr jsEngine, const AppInf o& appInfo, 146 JsValuePtr AdblockPlus::GlobalJsObject::Setup(JsEnginePtr jsEngine, const AppInf o& appInfo,
147 JsValuePtr obj) 147 JsValuePtr obj)
148 { 148 {
149 obj->SetProperty("_triggerEvent", jsEngine->NewCallback(::TriggerEventCallback )); 149 obj->SetProperty("_triggerEvent", jsEngine->NewCallback(::TriggerEventCallback ));
150 obj->SetProperty("_fileSystem",
151 FileSystemJsObject::Setup(jsEngine, jsEngine->NewObject()));
152 obj->SetProperty("console", 150 obj->SetProperty("console",
153 ConsoleJsObject::Setup(jsEngine, jsEngine->NewObject())); 151 ConsoleJsObject::Setup(jsEngine, jsEngine->NewObject()));
154 obj->SetProperty("_appInfo", 152 obj->SetProperty("_appInfo",
155 AppInfoJsObject::Setup(jsEngine, appInfo, jsEngine->NewObject())); 153 AppInfoJsObject::Setup(jsEngine, appInfo, jsEngine->NewObject()));
156 return obj; 154 return obj;
157 } 155 }
OLDNEW
« no previous file with comments | « src/FileSystemJsObject.cpp ('k') | src/JsEngine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld