Issue #1158 - removed unnecessary definitions and #ifdef/#else/#endif sections

src/plugin/PluginWbPassThrough.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginWbPassThrough.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
-#ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
-#endif
 #include "PluginSettings.h"
 #include "PluginClass.h"
 #include "PluginSystem.h"
 
 #include "wtypes.h"
 
 EXTERN_C IMAGE_DOS_HEADER __ImageBase;
 
 
 
@@ skipping 133 matching lines @@
       {
         boundDomain.SetString(domainRetrieved);
       }
     }
   }
 
   CString cookie;
   ULONG len1 = 2048;
   ULONG len2 = 2048;
 
-#ifdef SUPPORT_FILTER
   int contentType = CFilter::contentTypeAny;
 
   CPluginTab* tab = CPluginClass::GetTab(::GetCurrentThreadId());
   CPluginClient* client = CPluginClient::GetInstance();
 
 
   if (tab && client)
   {
     CString documentUrl = tab->GetDocumentUrl();
     // Page is identical to document => don't block
     if (documentUrl == src)
     {
       // fall through
     }
     else if (CPluginSettings::GetInstance()->IsPluginEnabled() && !client->IsWhitelistedUrl(std::wstring(documentUrl)))
     {
       boundDomain = tab->GetDocumentUrl();
-
       contentType = CFilter::contentTypeAny;
-
-#ifdef SUPPORT_FRAME_CACHING
       if ((tab != 0) && (tab->IsFrameCached(src)))
       {
         contentType = CFilter::contentTypeSubdocument;
       }
       else
-#endif // SUPPORT_FRAME_CACHING
-      contentType = GetContentType(mimeType, boundDomain, src);
+      {
+        contentType = GetContentType(mimeType, boundDomain, src);
+      }
       if (client->ShouldBlock(src, contentType, boundDomain, true))
       {
         isBlocked = true;
-
         DEBUG_BLOCKER("Blocker::Blocking Http-request:" + src);
       }
     }
     if (!isBlocked)
     {
       DEBUG_BLOCKER("Blocker::Ignoring Http-request:" + src)
     }
   }
 
 
@@ skipping 73 matching lines @@
     }
     if ((isBlocked)) 
     {
       m_shouldBlock = true;
       BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol);
       m_spInternetProtocolSink->ReportResult(S_FALSE, 0, L"");
 
       return INET_E_REDIRECT_FAILED;
     }
   }
-#endif // SUPPORT_FILTER
-
   return isBlocked ? S_FALSE : BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol);
 }
 
 
 HRESULT WBPassthruSink::Read(void *pv, ULONG cb, ULONG* pcbRead)
 {
   if (m_shouldBlock)
   {
     *pcbRead = 0;
     if (!m_lastDataReported)
@@ skipping 95 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->Read(pv, cb, pcbRead);
  }