|
This turned out quite a bit more complicated than expected. A JS callback needs to call JsEngine that in turn notifies FilterEngine. LazyFileSystem had to change to actually return a result that looks ok - otherwise filter engine initialization can never complete. And googletest macros had to be set because otherwise classes defined by it will conflict with <tr1/functional> that we include.
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+131 lines, -32 lines) |
Patch |
|
M |
include/AdblockPlus/FilterEngine.h
|
View
|
|
1 chunk |
+3 lines, -1 line |
0 comments
|
Download
|
|
M |
include/AdblockPlus/JsEngine.h
|
View
|
1
|
3 chunks |
+9 lines, -0 lines |
0 comments
|
Download
|
|
A |
include/AdblockPlus/tr1_functional.h
|
View
|
|
1 chunk |
+22 lines, -0 lines |
0 comments
|
Download
|
|
M |
lib/init.js
|
View
|
1
|
1 chunk |
+5 lines, -8 lines |
0 comments
|
Download
|
|
M |
src/FilterEngine.cpp
|
View
|
1
|
2 chunks |
+11 lines, -3 lines |
0 comments
|
Download
|
|
M |
src/GlobalJsObject.cpp
|
View
|
1
|
1 chunk |
+12 lines, -0 lines |
0 comments
|
Download
|
|
M |
src/JsEngine.cpp
|
View
|
1
|
1 chunk |
+18 lines, -0 lines |
0 comments
|
Download
|
|
M |
test/BaseJsTest.h
|
View
|
|
1 chunk |
+15 lines, -13 lines |
0 comments
|
Download
|
|
M |
test/FilterEngine.cpp
|
View
|
|
1 chunk |
+0 lines, -7 lines |
0 comments
|
Download
|
|
M |
test/JsEngine.cpp
|
View
|
1
|
2 chunks |
+31 lines, -0 lines |
0 comments
|
Download
|
|
M |
third_party/googletest.gyp
|
View
|
|
1 chunk |
+5 lines, -0 lines |
0 comments
|
Download
|
Total messages: 5
|