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

Issue 10420020: Made sure FilterEngine instances are always initialized (Closed)

Created:
May 16, 2013, 2:27 p.m. by Wladimir Palant
Modified:
May 23, 2013, 10:18 a.m.
Reviewers:
Felix Dahlke, Oleksandr
Visibility:
Public.

Description

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.

Patch Set 1 #

Patch Set 2 : Using a generic messaging mechanism #

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

Messages

Total messages: 5
Wladimir Palant
May 16, 2013, 2:27 p.m. (2013-05-16 14:27:49 UTC) #1
Felix Dahlke
I think it'd be nicer if JsEngine was not involved here, only FilterEngine is being ...
May 22, 2013, 3:13 p.m. (2013-05-22 15:13:44 UTC) #2
Wladimir Palant
Thinking a bit about it, we probably need a generic messaging mechanism that allows JS ...
May 22, 2013, 8:35 p.m. (2013-05-22 20:35:10 UTC) #3
Wladimir Palant
New patch set uploaded with a generic _triggerEvent() function instead of _initDone(). Only one callback ...
May 23, 2013, 6:40 a.m. (2013-05-23 06:40:36 UTC) #4
Felix Dahlke
May 23, 2013, 8:36 a.m. (2013-05-23 08:36:06 UTC) #5
LGTM, I prefer it this way :)

Powered by Google App Engine
This is Rietveld