Side by Side Diff: Shared/PluginClassThread.cpp
Issue 9998007:
Initial libadblockplus integration (Closed)
Patch Set: More integration, reflecting latest libadblockplus changes
Created April 9, 2013, 5:48 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« Shared/AdblockPlusDomTraverser.cpp ('k')
|
Shared/PluginConfiguration.cpp » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 #include "PluginStdAfx.h" | 1 #include "PluginStdAfx.h" |
| 2 | 2 |
| 3 #include <ctime> | 3 #include <ctime> |
| 4 | 4 |
| 5 #include "PluginClass.h" | 5 #include "PluginClass.h" |
| 6 #include "PluginDictionary.h" | 6 #include "PluginDictionary.h" |
| 7 #include "PluginSettings.h" | 7 #include "PluginSettings.h" |
| 8 #include "PluginSystem.h" | 8 #include "PluginSystem.h" |
| 9 #include "PluginConfiguration.h" | 9 #include "PluginConfiguration.h" |
| 10 #ifdef SUPPORT_FILTER | 10 #ifdef SUPPORT_FILTER |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 233 configuration->Invalidate(); | 233 configuration->Invalidate(); |
| 234 | 234 |
| 235 #ifdef SUPPORT_FILTER | 235 #ifdef SUPPORT_FILTER |
| 236 DEBUG_GENERAL("*** before isNewFilterVersion"); | 236 DEBUG_GENERAL("*** before isNewFilterVersion"); |
| 237 | 237 |
| 238 // Update filters, if needed (5 days * (random() * 0.4 + 0.8)) | 238 // Update filters, if needed (5 days * (random() * 0.4 + 0.8)) |
| 239 if (isNewFilterVersion) | 239 if (isNewFilterVersion) |
| 240 { | 240 { |
| 241 | 241 |
| 242 DEBUG_GENERAL("*** before CheckFilterAndDownload"); | 242 DEBUG_GENERAL("*** before CheckFilterAndDownload"); |
| 243 settings->CheckFilterAndDownload(); | 243 settings->RefreshFilterlist(); |
| 244 | 244 |
| 245 settings->MakeRequestForUpdate(); | 245 settings->MakeRequestForUpdate(); |
| 246 | 246 |
| 247 | 247 |
| 248 settings->Write(); | 248 settings->Write(); |
| 249 | 249 |
| 250 tab->OnUpdate(); | 250 tab->OnUpdate(); |
| 251 } | 251 } |
| 252 #endif // SUPPORT_FILTER | 252 #endif // SUPPORT_FILTER |
| 253 } | 253 } |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 348 bool isDone = false; | 348 bool isDone = false; |
| 349 | 349 |
| 350 s_criticalSectionLocal.Lock(); | 350 s_criticalSectionLocal.Lock(); |
| 351 { | 351 { |
| 352 isDone = s_isMainThreadDone || mainThread != s_hMainThread; | 352 isDone = s_isMainThreadDone || mainThread != s_hMainThread; |
| 353 } | 353 } |
| 354 s_criticalSectionLocal.Unlock(); | 354 s_criticalSectionLocal.Unlock(); |
| 355 | 355 |
| 356 return isDone; | 356 return isDone; |
| 357 } | 357 } |
| OLD | NEW |
« no previous file with comments
|
« Shared/AdblockPlusDomTraverser.cpp ('k')
|
Shared/PluginConfiguration.cpp » ('j')
|
no next file with comments »
