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

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

Issue 6299667012780032: Issues #696,1231,1264,1265 - Improve handling in PassthroughApp (Closed)
Left Patch Set: Get rid of yoda style and rename blockedByABPPageSize local var Created Sept. 22, 2014, 4:14 p.m.
Right Patch Set: rebase Created Oct. 17, 2014, 12:51 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
« no previous file with change/comment | « src/plugin/PluginTabBase.cpp ('k') | src/plugin/PluginWbPassThrough.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 » CString m_boundDomain; 19 » std::wstring m_boundDomain;
20 bool m_blockedInTransaction; 20 bool m_blockedInTransaction;
21 21
22 int GetContentTypeFromMimeType(const CString& mimeType); 22 int GetContentTypeFromMimeType(const CString& mimeType);
23 int GetContentTypeFromURL(const CString& src); 23 int GetContentTypeFromURL(const CString& src);
24 » int GetContentType(const CString& mimeType, const CString& domain, const CString& src); 24 » int GetContentType(const CString& mimeType, const std::wstring& domain, const CString& src);
25 public: 25 public:
26 BEGIN_COM_MAP(WBPassthruSink) 26 BEGIN_COM_MAP(WBPassthruSink)
27 COM_INTERFACE_ENTRY(IHttpNegotiate) 27 COM_INTERFACE_ENTRY(IHttpNegotiate)
28 COM_INTERFACE_ENTRY_CHAIN(BaseClass) 28 COM_INTERFACE_ENTRY_CHAIN(BaseClass)
29 END_COM_MAP() 29 END_COM_MAP()
30 30
31 BEGIN_SERVICE_MAP(WBPassthruSink) 31 BEGIN_SERVICE_MAP(WBPassthruSink)
32 SERVICE_ENTRY(IID_IHttpNegotiate) 32 SERVICE_ENTRY(IID_IHttpNegotiate)
33 END_SERVICE_MAP() 33 END_SERVICE_MAP()
34 34
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 76
77 //IInternetProtocol 77 //IInternetProtocol
78 STDMETHODIMP Read(/* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULO NG *pcbRead) override; 78 STDMETHODIMP Read(/* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULO NG *pcbRead) override;
79 79
80 STDMETHODIMP LockRequest(/* [in] */ DWORD dwOptions) override; 80 STDMETHODIMP LockRequest(/* [in] */ DWORD dwOptions) override;
81 STDMETHODIMP UnlockRequest() override; 81 STDMETHODIMP UnlockRequest() override;
82 82
83 bool m_shouldSupplyCustomContent; 83 bool m_shouldSupplyCustomContent;
84 bool m_hasOriginalStartCalled; 84 bool m_hasOriginalStartCalled;
85 }; 85 };
LEFTRIGHT

Powered by Google App Engine
This is Rietveld