Noissue - Change 'CPluginFilter::ShouldBlock()' to local function

src/plugin/AdblockPlusClient.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 100 matching lines @@
       message >> description.listed;
       result.push_back(description);
     }
     return result;
   }
 }
 
 CAdblockPlusClient* CAdblockPlusClient::s_instance = NULL;
 CComAutoCriticalSection CAdblockPlusClient::s_criticalSectionLocal;
 
-CAdblockPlusClient::CAdblockPlusClient()
-{
-  m_filter = std::auto_ptr<CPluginFilter>(new CPluginFilter());
-}
-
 bool CAdblockPlusClient::CallEngine(Communication::OutputBuffer& message, Communication::InputBuffer& inputBuffer)
 {
   DEBUG_GENERAL("CallEngine start");
   CriticalSection::Lock lock(enginePipeLock);
   try
   {
     if (!enginePipe)
       enginePipe.reset(OpenEnginePipe());
     enginePipe->WriteMessage(message);
     inputBuffer = enginePipe->ReadMessage();
@@ skipping 33 matching lines @@
       s_instance = client;
     }
 
     instance = s_instance;
   }
   s_criticalSectionLocal.Unlock();
 
   return instance;
 }
 
+namespace
+{
+  bool ShouldBlockLocal(const std::wstring& src, AdblockPlus::FilterEngine::ContentType contentType, const std::wstring& domain, bool addDebug)
+  {
+    std::wstring srcTrimmed = TrimString(src);
+
+    // We should not block the empty string, so all filtering does not make sense
+    // Therefore we just return
+    if (srcTrimmed.empty())
+    {
+      return false;
+    }
+
+    CPluginSettings* settings = CPluginSettings::GetInstance();
+
+    CPluginClient* client = CPluginClient::GetInstance();
+    bool result = client->Matches(srcTrimmed, contentType, domain);
+
+#ifdef ENABLE_DEBUG_RESULT
+    if (addDebug)
+    {
+      std::wstring type = ToUtf16String(AdblockPlus::FilterEngine::ContentTypeToString(contentType));
+      if (result)
+      {
+        CPluginDebug::DebugResultBlocking(type, srcTrimmed, domain);
+      }
+      else
+      {
+        CPluginDebug::DebugResultIgnoring(type, srcTrimmed, domain);
+      }
+    }
+#endif
+    return result;
+  }
+}
+
 bool CAdblockPlusClient::ShouldBlock(const std::wstring& src, AdblockPlus::FilterEngine::ContentType contentType, const std::wstring& domain, bool addDebug)
 {
   bool isBlocked = false;
   bool isCached = false;
   m_criticalSectionCache.Lock();
   {
     auto it = m_cacheBlockedSources.find(src);
 
     isCached = it != m_cacheBlockedSources.end();
     if (isCached)
     {
       isBlocked = it->second;
     }
   }
   m_criticalSectionCache.Unlock();
 
   if (!isCached)
   {
     m_criticalSectionFilter.Lock();
     {
-      isBlocked = m_filter->ShouldBlock(src, contentType, domain, addDebug);
+      isBlocked = ShouldBlockLocal(src, contentType, domain, addDebug);
     }
     m_criticalSectionFilter.Unlock();
 
     // Cache result, if content type is defined
     if (contentType != AdblockPlus::FilterEngine::ContentType::CONTENT_TYPE_OTHER)
     {
       m_criticalSectionCache.Lock();
       {
         m_cacheBlockedSources[src] = isBlocked;
       }
@@ skipping 323 matching lines @@
   DEBUG_GENERAL("CompareVersions");
   Communication::OutputBuffer request;
   request << Communication::PROC_COMPARE_VERSIONS << ToUtf8String(v1) << ToUtf8String(v2);
   Communication::InputBuffer response;
   if (!CallEngine(request, response))
     return 0;
   int result;
   response >> result;
   return result;
 }