Issue 1183 - Fix Acceptable Ads hiding

src/plugin/PluginTabBase.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClient.h"
 #include "PluginSettings.h"
 #ifdef SUPPORT_CONFIG
 #include "PluginConfig.h"
 #endif
 #include "PluginTab.h"
 #include "PluginDomTraverser.h"
 #include "PluginClass.h"
@@ skipping 165 matching lines @@
   DEBUG_GENERAL("Invoke");
   if (FAILED(hr))
   {
     DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_CREATE_SETTINGS_JAVASCRIPT, PLUGIN_ERROR_CREATE_SETTINGS_JAVASCRIPT_INVOKE, "CPluginTabBase::InjectABP - Failed to create Settings in JavaScript");
   }
 }
 
 void CPluginTabBase::OnDownloadComplete(IWebBrowser2* browser)
 {
 #ifdef SUPPORT_DOM_TRAVERSER
-  if (!CPluginClient::GetInstance()->IsWhitelistedUrl(std::wstring(GetDocumentUrl())))
-  {
-    if (CPluginClient::GetInstance()->HidingEnabledOnDomain(std::wstring(GetDocumentUrl())))

[Felix Dahlke, 2014/08/08 16:11:35]

Oh noes, the arrow pattern! :D Can you merge this with the statement above and
good old &&?

-    {
-      m_traverser->TraverseDocument(browser, GetDocumentDomain(), GetDocumentUrl());
-    }
+  CPluginClient* client = CPluginClient::GetInstance();
+  std::wstring url = std::wstring(GetDocumentUrl());
+  if (!client->IsWhitelistedUrl(url) && !client->IsElemhideWhitelistedOnDomain(url))
+  {
+    m_traverser->TraverseDocument(browser, GetDocumentDomain(), GetDocumentUrl());
   }
 #endif // SUPPORT_DOM_TRAVERSER
 
   InjectABP(browser);
 }
 
 void CPluginTabBase::OnDocumentComplete(IWebBrowser2* browser, const CString& url, bool isDocumentBrowser)
 {
   CString documentUrl = GetDocumentUrl();
 
@@ skipping 187 matching lines @@
           CPluginClient::LogPluginError(pluginError.GetErrorCode(), pluginError.GetErrorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), true, pluginError.GetProcessId(), pluginError.GetThreadId());
         }
 
         // Non-hanging sleep
         Sleep(50);
       }
 
       tabLoopIteration++;
   }
 }