OLD | NEW |
1 #include "PluginStdAfx.h" | 1 #include "PluginStdAfx.h" |
2 | 2 |
3 #include "PluginClient.h" | 3 #include "PluginClient.h" |
4 #include "PluginSettings.h" | 4 #include "PluginSettings.h" |
5 #ifdef SUPPORT_CONFIG | 5 #ifdef SUPPORT_CONFIG |
6 #include "PluginConfig.h" | 6 #include "PluginConfig.h" |
7 #endif | 7 #endif |
8 #include "PluginTab.h" | 8 #include "PluginTab.h" |
9 #include "PluginDomTraverser.h" | 9 #include "PluginDomTraverser.h" |
10 #include "PluginClass.h" | 10 #include "PluginClass.h" |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
176 DEBUG_GENERAL("Invoke"); | 176 DEBUG_GENERAL("Invoke"); |
177 if (FAILED(hr)) | 177 if (FAILED(hr)) |
178 { | 178 { |
179 DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_CREATE_SETTINGS_JAVASCRIPT, PLUGIN_ERROR_CR
EATE_SETTINGS_JAVASCRIPT_INVOKE, "CPluginTabBase::InjectABP - Failed to create S
ettings in JavaScript"); | 179 DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_CREATE_SETTINGS_JAVASCRIPT, PLUGIN_ERROR_CR
EATE_SETTINGS_JAVASCRIPT_INVOKE, "CPluginTabBase::InjectABP - Failed to create S
ettings in JavaScript"); |
180 } | 180 } |
181 } | 181 } |
182 | 182 |
183 void CPluginTabBase::OnDownloadComplete(IWebBrowser2* browser) | 183 void CPluginTabBase::OnDownloadComplete(IWebBrowser2* browser) |
184 { | 184 { |
185 #ifdef SUPPORT_DOM_TRAVERSER | 185 #ifdef SUPPORT_DOM_TRAVERSER |
186 if (!CPluginClient::GetInstance()->IsWhitelistedUrl(std::wstring(GetDocumentUr
l()))) | 186 CPluginClient* client = CPluginClient::GetInstance(); |
| 187 std::wstring url = std::wstring(GetDocumentUrl()); |
| 188 if (!client->IsWhitelistedUrl(url) && !client->IsElemhideWhitelistedOnDomain(u
rl)) |
187 { | 189 { |
188 m_traverser->TraverseDocument(browser, GetDocumentDomain(), GetDocumentUrl()
); | 190 m_traverser->TraverseDocument(browser, GetDocumentDomain(), GetDocumentUrl()
); |
189 } | 191 } |
190 #endif // SUPPORT_DOM_TRAVERSER | 192 #endif // SUPPORT_DOM_TRAVERSER |
191 | 193 |
192 InjectABP(browser); | 194 InjectABP(browser); |
193 } | 195 } |
194 | 196 |
195 void CPluginTabBase::OnDocumentComplete(IWebBrowser2* browser, const CString& ur
l, bool isDocumentBrowser) | 197 void CPluginTabBase::OnDocumentComplete(IWebBrowser2* browser, const CString& ur
l, bool isDocumentBrowser) |
196 { | 198 { |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
386 CPluginClient::LogPluginError(pluginError.GetErrorCode(), pluginError.
GetErrorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), tr
ue, pluginError.GetProcessId(), pluginError.GetThreadId()); | 388 CPluginClient::LogPluginError(pluginError.GetErrorCode(), pluginError.
GetErrorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), tr
ue, pluginError.GetProcessId(), pluginError.GetThreadId()); |
387 } | 389 } |
388 | 390 |
389 // Non-hanging sleep | 391 // Non-hanging sleep |
390 Sleep(50); | 392 Sleep(50); |
391 } | 393 } |
392 | 394 |
393 tabLoopIteration++; | 395 tabLoopIteration++; |
394 } | 396 } |
395 } | 397 } |
OLD | NEW |