Issue 3237 - Whitelisted AFS ad is not shown on netzwelt.de

src/plugin/PluginWbPassThrough.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 124 matching lines @@
   }
 }
 
 WBPassthruSink::WBPassthruSink()
   : m_currentPositionOfSentPage(0)
   , m_contentType(ContentType::CONTENT_TYPE_OTHER)
   , m_isCustomResponse(false)
 {
 }
 
 ContentType WBPassthruSink::GetContentTypeFromMimeType(const std::wstring& mimeType)

[Eric, 2015/12/15 03:18:18]

While not strictly necessary, there are a few things that would improve the
code, as long as we're touching it here. They're listed in the order I care.
- Add a comment here listing the media type strings found in testing. That's
some useful information that doesn't deserve to get buried in a comment in a
review.
- "MimeType" should be renamed "MediaTypeList". The present name is somewhat
confusing unless you track down where it's called from.
- I'd use "InferContentType" rather than "Get...". This is a heuristic, not just
a parse-and-fetch operation like its name seems to indicate.
- This function could be in an anonymous namespace. It doesn't need to be a
static class member.

I'm not going to hold the review up if these aren't present, but I would like to
see them, particularly the first, since it directly related to the defect being
fixed in the present change set.

[sergei, 2015/12/15 15:29:31]

The same from my side.

 {
+  if ((mimeType.find(L"text/html") != std::wstring::npos) ||
+      (mimeType.find(L"application/xhtml+xml") != std::wstring::npos))
+  {
+    return ContentType::CONTENT_TYPE_SUBDOCUMENT;
+  }
   if (mimeType.find(L"image/") != std::wstring::npos)
   {
     return ContentType::CONTENT_TYPE_IMAGE;
   }
   if (mimeType.find(L"text/css") != std::wstring::npos)
   {
     return ContentType::CONTENT_TYPE_STYLESHEET;
   }
   if ((mimeType.find(L"application/javascript") != std::wstring::npos) || (mimeType.find(L"application/json") != std::wstring::npos))
   {
     return ContentType::CONTENT_TYPE_SCRIPT;
   }
   if (mimeType.find(L"application/x-shockwave-flash") != std::wstring::npos)
   {
     return ContentType::CONTENT_TYPE_OBJECT;
   }
-  if (mimeType.find(L"text/html") != std::wstring::npos)
-  {
-    return ContentType::CONTENT_TYPE_SUBDOCUMENT;
-  }
   // It is important to have this check last, since it is rather generic, and might overlay text/html, for example
   if (mimeType.find(L"xml") != std::wstring::npos)
   {
     return ContentType::CONTENT_TYPE_XMLHTTPREQUEST;
   }
 
   return ContentType::CONTENT_TYPE_OTHER;
 }
 
 ContentType WBPassthruSink::GetContentTypeFromURL(const std::wstring& src)
@@ skipping 256 matching lines @@
   }
 
   return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, m_spInternetProtocol);
 }
 
 STDMETHODIMP WBPassthru::Read(/* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULONG *pcbRead)
 {
   WBPassthruSink* pSink = GetSink();
   return pSink->OnRead(pv, cb, pcbRead);
 }