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

Delta Between Two Patch Sets: src/plugin/PluginWbPassThrough.h

Issue 4912420225024000: Issue #1234 - Convert strings associated with URL's (Closed)
Left Patch Set: Rebased Created Oct. 21, 2014, 6:26 p.m.
Right Patch Set: Created Jan. 5, 2015, 4:15 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
LEFTRIGHT
1 #pragma once 1 #pragma once
2 #include <cstdint> 2 #include <cstdint>
3 #include "ProtocolCF.h" 3 #include "ProtocolCF.h"
4 #include "ProtocolImpl.h" 4 #include "ProtocolImpl.h"
5 #define IE_MAX_URL_LENGTH 2048 5 #define IE_MAX_URL_LENGTH 2048
6 6
7 class WBPassthruSink : 7 class WBPassthruSink :
8 public PassthroughAPP::CInternetProtocolSinkWithSP<WBPassthruSink, CComM ultiThreadModel>, 8 public PassthroughAPP::CInternetProtocolSinkWithSP<WBPassthruSink, CComM ultiThreadModel>,
9 public IHttpNegotiate 9 public IHttpNegotiate
10 { 10 {
11 typedef PassthroughAPP::CInternetProtocolSinkWithSP<WBPassthruSink, CCom MultiThreadModel> BaseClass; 11 typedef PassthroughAPP::CInternetProtocolSinkWithSP<WBPassthruSink, CCom MultiThreadModel> BaseClass;
12 12
13 public: 13 public:
14 WBPassthruSink(); 14 WBPassthruSink();
15 15
16 uint64_t m_currentPositionOfSentPage; 16 uint64_t m_currentPositionOfSentPage;
17 CComPtr<IInternetProtocol> m_pTargetProtocol; 17 CComPtr<IInternetProtocol> m_pTargetProtocol;
18 int m_contentType; 18 int m_contentType;
19 std::wstring m_boundDomain; 19 std::wstring m_boundDomain;
20 » bool m_blockedInTransaction; 20 » bool m_isCustomResponse;
21 21
22 int GetContentTypeFromMimeType(const CString& mimeType); 22 int GetContentTypeFromMimeType(const CString& mimeType);
23 int GetContentTypeFromURL(const std::wstring& src); 23 int GetContentTypeFromURL(const std::wstring& src);
sergei 2015/01/06 13:18:18 We use tabs in this file, but here are spaces, it'
Eric 2015/01/06 19:38:59 Even more than inconsistent, the existing code vio
24 int GetContentType(const CString& mimeType, const std::wstring& domain, const std::wstring& src); 24 int GetContentType(const CString& mimeType, const std::wstring& domain, const std::wstring& src);
25 bool IsFlashRequest(const wchar_t* const* additionalHeaders);
25 public: 26 public:
26 BEGIN_COM_MAP(WBPassthruSink) 27 BEGIN_COM_MAP(WBPassthruSink)
27 COM_INTERFACE_ENTRY(IHttpNegotiate) 28 COM_INTERFACE_ENTRY(IHttpNegotiate)
28 COM_INTERFACE_ENTRY_CHAIN(BaseClass) 29 COM_INTERFACE_ENTRY_CHAIN(BaseClass)
29 END_COM_MAP() 30 END_COM_MAP()
30 31
31 BEGIN_SERVICE_MAP(WBPassthruSink) 32 BEGIN_SERVICE_MAP(WBPassthruSink)
32 SERVICE_ENTRY(IID_IHttpNegotiate) 33 SERVICE_ENTRY(IID_IHttpNegotiate)
33 END_SERVICE_MAP() 34 END_SERVICE_MAP()
34 35
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 typedef PassthroughAPP::CInternetProtocol<WBStartPolicy> BaseClass; 71 typedef PassthroughAPP::CInternetProtocol<WBStartPolicy> BaseClass;
71 public: 72 public:
72 WBPassthru(); 73 WBPassthru();
73 // IInternetProtocolRoot 74 // IInternetProtocolRoot
74 STDMETHODIMP Start(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, 75 STDMETHODIMP Start(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink,
75 IInternetBindInfo *pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved) override ; 76 IInternetBindInfo *pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved) override ;
76 77
77 //IInternetProtocol 78 //IInternetProtocol
78 STDMETHODIMP Read(/* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULO NG *pcbRead) override; 79 STDMETHODIMP Read(/* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULO NG *pcbRead) override;
79 80
80 STDMETHODIMP LockRequest(/* [in] */ DWORD dwOptions) override;
81 STDMETHODIMP UnlockRequest() override;
82
83 bool m_shouldSupplyCustomContent; 81 bool m_shouldSupplyCustomContent;
84 bool m_hasOriginalStartCalled;
85 }; 82 };
LEFTRIGHT

Powered by Google App Engine
This is Rietveld