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

src/engine/Main.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 10 matching lines @@
 #include <thread>
 #include <Windows.h>
 
 #include "../shared/AutoHandle.h"
 #include "../shared/Communication.h"
 #include "../shared/Dictionary.h"
 #include "../shared/Utils.h"
 #include "../shared/Version.h"
 #include "../shared/CriticalSection.h"
 #include "../shared/IE_version.h"
+#include "../shared/ContentType.h"
 #include "AdblockPlus.h"
 #include "Debug.h"
 #include "Updater.h"
 
 namespace
 {
   std::auto_ptr<AdblockPlus::FilterEngine> filterEngine;
   std::auto_ptr<Updater> updater;
   int activeConnections = 0;
   CriticalSection activeConnectionsLock;
@@ skipping 58 matching lines @@
   {
     Communication::OutputBuffer response;
 
     Communication::ProcType procedure;
     request >> procedure;
     switch (procedure)
     {
       case Communication::PROC_MATCHES:
       {
         std::string url;
-        std::string type;
+        using namespace AdblockPlus;
+        FilterEngine::ContentType contentType;
         std::string documentUrl;
-        request >> url >> type >> documentUrl;
-        referrerMapping.Add(url, documentUrl); 
-        AdblockPlus::FilterPtr filter = filterEngine->Matches(url, type, referrerMapping.BuildReferrerChain(documentUrl));
+        request >> url >> contentType >> documentUrl;
+        auto isFrame = contentType == FilterEngine::ContentType::CONTENT_TYPE_SUBDOCUMENT ?
+          ReferrerMapping::FrameIndicator::FRAME_INDICATOR_FRAME:

[Oleksandr, 2015/01/30 12:39:11]

This doesn't seem to be defined in the referenced libadblockplus version, is it?

[sergei, 2015/01/30 13:20:06]

Sorry, I accidentally was working with my local version which is a little bit
ahead of the current state.

Now it's removed.

+          ReferrerMapping::FrameIndicator::FRAME_INDICATOR_NOT_FRAME;
+
+        referrerMapping.Add(url, documentUrl, isFrame);
+        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;
 }