Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/plugin/PluginWbPassThrough.cpp

Issue 5069344035831808: Issue 1193 - Fix thumbnails on youtube: do not hang blocked subdocument requests (Closed)
Patch Set: Created Aug. 12, 2014, 12:49 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #include "PluginStdAfx.h" 1 #include "PluginStdAfx.h"
2 2
3 #include "PluginWbPassThrough.h" 3 #include "PluginWbPassThrough.h"
4 #include "PluginClient.h" 4 #include "PluginClient.h"
5 #include "PluginClientFactory.h" 5 #include "PluginClientFactory.h"
6 #ifdef SUPPORT_FILTER 6 #ifdef SUPPORT_FILTER
7 #include "PluginFilter.h" 7 #include "PluginFilter.h"
8 #endif 8 #endif
9 #include "PluginSettings.h" 9 #include "PluginSettings.h"
10 #include "PluginClass.h" 10 #include "PluginClass.h"
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 { 249 {
250 m_shouldBlock = true; 250 m_shouldBlock = true;
251 BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTa rgetProtocol); 251 BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTa rgetProtocol);
252 252
253 m_spInternetProtocolSink->ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE, L"t ext/html"); 253 m_spInternetProtocolSink->ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE, L"t ext/html");
254 254
255 //Here we check if we are running on Windows 8 Consumer Preview. 255 //Here we check if we are running on Windows 8 Consumer Preview.
256 //For some reason on that environment the next line causes IE to crash 256 //For some reason on that environment the next line causes IE to crash
257 if (CPluginSettings::GetInstance()->GetWindowsBuildNumber() != 8250) 257 if (CPluginSettings::GetInstance()->GetWindowsBuildNumber() != 8250)
258 { 258 {
259 m_spInternetProtocolSink->ReportResult(INET_E_REDIRECTING, 301, L"res:// mshtml.dll/blank.htm"); 259 m_spInternetProtocolSink->ReportResult(INET_E_REDIRECT_FAILED, 0, szUrl) ;
Oleksandr 2014/08/12 00:56:57 The behavior here changed after the APP update in
260 } 260 }
261 261
262 return INET_E_REDIRECT_FAILED; 262 return INET_E_REDIRECT_FAILED;
263 } 263 }
264 if (((contentType == CFilter::contentTypeScript)) && (isBlocked)) 264 if (((contentType == CFilter::contentTypeScript)) && (isBlocked))
265 { 265 {
266 m_shouldBlock = true; 266 m_shouldBlock = true;
267 BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTa rgetProtocol); 267 BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTa rgetProtocol);
268 m_spInternetProtocolSink->ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE, L"t ext/javascript"); 268 m_spInternetProtocolSink->ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE, L"t ext/javascript");
269 m_spInternetProtocolSink->ReportResult(INET_E_REDIRECTING, 301, L"data:"); 269 m_spInternetProtocolSink->ReportResult(INET_E_REDIRECTING, 301, L"data:");
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, 395 return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI,
396 dwReserved, m_spInternetProtocol); 396 dwReserved, m_spInternetProtocol);
397 } 397 }
398 398
399 STDMETHODIMP WBPassthru::Read( /* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULONG *pcbRead) 399 STDMETHODIMP WBPassthru::Read( /* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULONG *pcbRead)
400 { 400 {
401 401
402 WBPassthruSink* pSink = GetSink(); 402 WBPassthruSink* pSink = GetSink();
403 return pSink->Read(pv, cb, pcbRead); 403 return pSink->Read(pv, cb, pcbRead);
404 } 404 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld