OLD | NEW |
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-2015 Eyeo GmbH | 3 * Copyright (C) 2006-2015 Eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
360 return nativeHr; | 360 return nativeHr; |
361 } | 361 } |
362 else if (CPluginSettings::GetInstance()->IsPluginEnabled() && !client->IsWhi
telistedUrl(documentUrl)) | 362 else if (CPluginSettings::GetInstance()->IsPluginEnabled() && !client->IsWhi
telistedUrl(documentUrl)) |
363 { | 363 { |
364 if (tab->IsFrameCached(src)) | 364 if (tab->IsFrameCached(src)) |
365 { | 365 { |
366 m_contentType = ContentType::CONTENT_TYPE_SUBDOCUMENT; | 366 m_contentType = ContentType::CONTENT_TYPE_SUBDOCUMENT; |
367 } | 367 } |
368 } | 368 } |
369 } | 369 } |
| 370 else if (!CPluginClass::HasTabs()) |
| 371 { |
| 372 m_contentType = ContentType::CONTENT_TYPE_DOCUMENT; |
| 373 } |
370 | 374 |
371 if (IsFlashRequest(pszAdditionalHeaders)) | 375 if (IsFlashRequest(pszAdditionalHeaders)) |
372 { | 376 { |
373 m_contentType = ContentType::CONTENT_TYPE_OBJECT_SUBREQUEST; | 377 m_contentType = ContentType::CONTENT_TYPE_OBJECT_SUBREQUEST; |
374 } | 378 } |
375 | 379 |
376 if (pszAdditionalHeaders && *pszAdditionalHeaders && IsXmlHttpRequest(*pszAddi
tionalHeaders)) | 380 if (pszAdditionalHeaders && *pszAdditionalHeaders && IsXmlHttpRequest(*pszAddi
tionalHeaders)) |
377 { | 381 { |
378 m_contentType = ContentType::CONTENT_TYPE_XMLHTTPREQUEST; | 382 m_contentType = ContentType::CONTENT_TYPE_XMLHTTPREQUEST; |
379 } | 383 } |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
436 } | 440 } |
437 | 441 |
438 return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, m_spInterne
tProtocol); | 442 return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, m_spInterne
tProtocol); |
439 } | 443 } |
440 | 444 |
441 STDMETHODIMP WBPassthru::Read(/* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [o
ut] */ ULONG *pcbRead) | 445 STDMETHODIMP WBPassthru::Read(/* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [o
ut] */ ULONG *pcbRead) |
442 { | 446 { |
443 WBPassthruSink* pSink = GetSink(); | 447 WBPassthruSink* pSink = GetSink(); |
444 return pSink->OnRead(pv, cb, pcbRead); | 448 return pSink->OnRead(pv, cb, pcbRead); |
445 } | 449 } |
OLD | NEW |