Issue 1557 - Update to the recent libadblockplus to reduce additional updates in the logic later.

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 71 matching lines @@
   {
     Communication::OutputBuffer response;
 
     Communication::ProcType procedure;
     request >> procedure;
     switch (procedure)
     {
       case Communication::PROC_MATCHES:
       {
         std::string url;
-        std::string type;
+        int32_t type;
         std::string documentUrl;
         request >> url >> type >> documentUrl;
-        referrerMapping.Add(url, documentUrl); 
-        AdblockPlus::FilterPtr filter = filterEngine->Matches(url, type, referrerMapping.BuildReferrerChain(documentUrl));
+        using namespace AdblockPlus;
+        auto contentType = static_cast<FilterEngine::ContentType>(type);
+        auto isFrame = contentType == FilterEngine::ContentType::CONTENT_TYPE_SUBDOCUMENT ?
+          ReferrerMapping::FrameIndicator::FRAME_INDICATOR_FRAME:
+        ReferrerMapping::FrameIndicator::FRAME_INDICATOR_NOT_FRAME;

[Eric, 2015/01/13 17:29:36]

The indentation is off.

Also, the expression would be easier to read with parentheses around the
condition in the first line.

[sergei, 2015/01/28 13:44:45]

Indentation is fixed.
I don't find it easier to read with parentheses.

+
+        referrerMapping.Add(url, documentUrl, isFrame);

[Eric, 2015/01/13 17:29:36]

ReferrerMapping::Add() is declared with only two arguments. Presumably this
change requires some change to libadblockplus. 

Shouldn't there be a change to .hgsubstate in the present review? The code
should be reviewed as committed.

[sergei, 2015/01/28 13:44:45]

Sure, the main aim of the whole change is to update to the recent state of
libadblockplus. Sorry, I forgot to put .hgsubstate. Now, it's fixed.

+        AdblockPlus::FilterPtr filter = filterEngine->Matches(url, contentType, referrerMapping.BuildFrameStructure(documentUrl));
         response << (filter && filter->GetType() != AdblockPlus::Filter::TYPE_EXCEPTION);
         break;
       }
       case Communication::PROC_GET_ELEMHIDE_SELECTORS:
       {
         std::string domain;
         request >> domain;
         WriteStrings(response, filterEngine->GetElementHidingSelectors(domain));
         break;
       }
@@ 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);
+        AdblockPlus::FilterPtr match = filterEngine->Matches(url,
+          AdblockPlus::FilterEngine::ContentType::CONTENT_TYPE_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);
+        AdblockPlus::FilterPtr match = filterEngine->Matches(url,
+          AdblockPlus::FilterEngine::ContentType::CONTENT_TYPE_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;
 }