Issue 1183 - Fix Acceptable Ads hiding

src/engine/Main.cpp

 #include <AdblockPlus.h>
 #include <functional>
 #include <vector>
 #include <thread>
 #include <Windows.h>
 
 #include "../shared/AutoHandle.h"
 #include "../shared/Communication.h"
 #include "../shared/Dictionary.h"
 #include "../shared/Utils.h"
@@ skipping 76 matching lines @@
     {
       case Communication::PROC_MATCHES:
       {
         std::string url;
         std::string type;
         std::string documentUrl;
         request >> url >> type >> documentUrl;
         referrerMapping.Add(url, documentUrl); 
         AdblockPlus::FilterPtr filter = filterEngine->Matches(url, type, referrerMapping.BuildReferrerChain(documentUrl));
         response << (filter && filter->GetType() != AdblockPlus::Filter::TYPE_EXCEPTION);
-        break;
-      }
-      case Communication::PROC_HIDING_ENABLED_ON_DOMAIN:

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

Since this is conceptually very similar to PROC_IS_WHITELISTED_URL, I propose
this:

1. Rename it to "PROC_IS_ELEMHIDE_WHITELISTED_ON_URL" and move it below that
one.
2. Rename "documentUrl" to "url".

-      {
-        std::string type;

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

Unused, isn't it?

-        std::string documentUrl;
-        request >> documentUrl;
-        AdblockPlus::FilterPtr filter = filterEngine->Matches(documentUrl, "ELEMHIDE", documentUrl);
-        response << (!filter);

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

Superfluous parentheses.

More importantly, this only checks if there was a filter, not that it was
actually an element hiding filter. Should basically work the same way as
PROC_IS_WHITELISTED_URL (logic negated of course):

response << (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION);

         break;
       }
       case Communication::PROC_GET_ELEMHIDE_SELECTORS:
       {
         std::string domain;
         request >> domain;
         WriteStrings(response, filterEngine->GetElementHidingSelectors(domain));
         break;
       }
       case Communication::PROC_AVAILABLE_SUBSCRIPTIONS:
@@ skipping 79 matching lines @@
         }
 
         WriteStrings(response, domains);
         break;
       }
       case Communication::PROC_IS_WHITELISTED_URL:
       {
         std::string url;
         request >> url;
         AdblockPlus::FilterPtr match = filterEngine->Matches(url, "DOCUMENT", url);
+        response << (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION);
+        break;
+      }
+      case Communication::PROC_IS_ELEMHIDE_WHITELISTED_ON_URL:
+      {
+        std::string url;
+        request >> url;
+        AdblockPlus::FilterPtr match = filterEngine->Matches(url, "ELEMHIDE", url);
         response << (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION);
         break;
       }
       case Communication::PROC_ADD_FILTER:
       {
         std::string text;
         request >> text;
 
         filterEngine->GetFilter(text)->AddToList();
         break;
@@ skipping 270 matching lines @@
     }
     catch (const std::runtime_error& e)
     {
       DebugException(e);
       return 1;
     }
   }
 
   return 0;
 }