Implement GetBytesReceived() in base class

include/wx/msw/webrequest_winhttp.h

@@ -79,8 +79,6 @@ public:
 
     wxFileOffset GetBytesExpectedToSend() const wxOVERRIDE { return m_dataSize; }
 
-    wxFileOffset GetBytesReceived() const wxOVERRIDE { return m_bytesReceived; }
-
     void HandleCallback(DWORD dwInternetStatus, LPVOID lpvStatusInformation,
         DWORD dwStatusInformationLength);
 
@@ -94,7 +92,6 @@ private:
     wxScopedPtr<wxWebAuthChallengeWinHTTP> m_authChallenge;
     wxMemoryBuffer m_dataWriteBuffer;
     wxFileOffset m_dataWritten;
-    wxFileOffset m_bytesReceived;
 
     void SendRequest();
 
@@ -105,7 +102,6 @@ private:
     void SetFailedWithLastError();
 
     friend class wxWebAuthChallengeWinHTTP;
-    friend class wxWebResponseWinHTTP;
 
     wxDECLARE_NO_COPY_CLASS(wxWebRequestWinHTTP);
 };

include/wx/webrequest.h

@@ -83,12 +83,14 @@ public:
 
     virtual wxFileOffset GetBytesExpectedToSend() const = 0;
 
-    virtual wxFileOffset GetBytesReceived() const = 0;
+    virtual wxFileOffset GetBytesReceived() const;
 
     virtual wxFileOffset GetBytesExpectedToReceive() const;
 
     void SetState(State state, const wxString& failMsg = "");
 
+    void ReportDataReceived(size_t sizeReceived);
+
     static void SplitParameters(const wxString& s, wxString& value,
         wxWebRequestHeaderMap& parameters);
 
@@ -108,7 +110,8 @@ protected:
         m_session(session),
         m_id(id),
         m_state(State_Idle),
-        m_ignoreServerErrorStatus(false) { }
+        m_ignoreServerErrorStatus(false),
+        m_bytesReceived(0) { }
 
     bool CheckServerStatus();
 
@@ -119,6 +122,7 @@ private:
     int m_id;
     State m_state;
     bool m_ignoreServerErrorStatus;
+    wxFileOffset m_bytesReceived;
     wxCharBuffer m_dataText;
 
     void ProcessStateEvent(State state, const wxString& failMsg);