Chromium Code Reviews| Index: chrome_frame/protocol_sink_wrap.cc |
| =================================================================== |
| --- chrome_frame/protocol_sink_wrap.cc (revision 214941) |
| +++ chrome_frame/protocol_sink_wrap.cc (working copy) |
| @@ -4,6 +4,7 @@ |
| #include <htiframe.h> |
| #include <mshtml.h> |
| +#include <algorithm> |
| #include "chrome_frame/protocol_sink_wrap.h" |
| @@ -21,6 +22,8 @@ |
| #include "chrome_frame/policy_settings.h" |
| #include "chrome_frame/utils.h" |
| +using std::min; |
| + |
| // BINDSTATUS_SERVER_MIMETYPEAVAILABLE == 54. Introduced in IE 8, so |
| // not in everyone's headers yet. See: |
| // http://msdn.microsoft.com/en-us/library/ms775133(VS.85,loband).aspx |
| @@ -465,6 +468,7 @@ |
| HRESULT ProtData::ReportData(IInternetProtocolSink* delegate, |
| DWORD flags, ULONG progress, ULONG max_progress) { |
| + bool ignore_Use_GCF_MetaData = SkipMetaDataCheck(); |
|
grt (UTC plus 2)
2013/08/02 01:42:50
since SkipMetaDataCheck may do work (hit the regis
|
| if (renderer_type_ != RENDERER_TYPE_UNDETERMINED) { |
| // We are just pass through now, avoid false positive crash reports. |
| ExceptionBarrierReportOnlyModule barrier; |
| @@ -478,7 +482,8 @@ |
| last_chance = true; |
| } |
| - renderer_type_ = DetermineRendererType(buffer_, buffer_size_, last_chance); |
| + renderer_type_ = ignore_Use_GCF_MetaData ? RENDERER_TYPE_OTHER |
| + : DetermineRendererType(buffer_, buffer_size_, last_chance); |
| if (renderer_type_ == RENDERER_TYPE_UNDETERMINED) { |
| // do not report anything, we need more data. |