From a561cf199b3899dab97eff9ccc85bd7c34eff3e1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 15 Jan 2021 23:49:06 +0100
Subject: [PATCH] Remove semi-public wxWebSession::GetImpl()

It's better not to have this method in the public class, even if it
means that we need to pass a wxWebSessionImpl object to wxWebRequestImpl
ctor explicitly now.

No real changes.
---
 include/wx/private/webrequest.h  | 5 ++++-
 include/wx/webrequest.h          | 2 --
 src/common/webrequest.cpp        | 7 +++++--
 src/common/webrequest_curl.cpp   | 2 +-
 src/msw/webrequest_winhttp.cpp   | 2 +-
 src/osx/webrequest_urlsession.mm | 2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/include/wx/private/webrequest.h b/include/wx/private/webrequest.h
index 9a54668ae3..ab58725167 100644
--- a/include/wx/private/webrequest.h
+++ b/include/wx/private/webrequest.h
@@ -107,7 +107,10 @@ protected:
     wxFileOffset m_dataSize;
     wxScopedPtr<wxInputStream> m_dataStream;
 
-    wxWebRequestImpl(wxWebSession& session, wxEvtHandler* handler, int id);
+    wxWebRequestImpl(wxWebSession& session,
+                     wxWebSessionImpl& sessionImpl,
+                     wxEvtHandler* handler,
+                     int id);
 
     // Call SetState() with either State_Failed or State_Completed appropriate
     // for the response status.
diff --git a/include/wx/webrequest.h b/include/wx/webrequest.h
index 52499915c8..ac69374a21 100644
--- a/include/wx/webrequest.h
+++ b/include/wx/webrequest.h
@@ -230,8 +230,6 @@ public:
 
     void Close();
 
-    wxWebSessionImpl* GetImpl() const { return m_impl.get(); }
-
 private:
     static void RegisterFactory(const wxString& backend,
                                 wxWebSessionFactory* factory);
diff --git a/src/common/webrequest.cpp b/src/common/webrequest.cpp
index a405b3fcef..dcfaeabb55 100644
--- a/src/common/webrequest.cpp
+++ b/src/common/webrequest.cpp
@@ -55,9 +55,12 @@ static const wxStringCharType* wxNO_IMPL_MSG
 //
 // wxWebRequestImpl
 //
-wxWebRequestImpl::wxWebRequestImpl(wxWebSession& session, wxEvtHandler* handler, int id)
+wxWebRequestImpl::wxWebRequestImpl(wxWebSession& session,
+                                   wxWebSessionImpl& sessionImpl,
+                                   wxEvtHandler* handler,
+                                   int id)
     : m_storage(wxWebRequest::Storage_Memory),
-      m_headers(session.GetImpl()->GetHeaders()),
+      m_headers(sessionImpl.GetHeaders()),
       m_dataSize(0),
       m_session(session),
       m_handler(handler),
diff --git a/src/common/webrequest_curl.cpp b/src/common/webrequest_curl.cpp
index d2927039b9..3d42e5f08c 100644
--- a/src/common/webrequest_curl.cpp
+++ b/src/common/webrequest_curl.cpp
@@ -156,7 +156,7 @@ wxWebRequestCURL::wxWebRequestCURL(wxWebSession & session,
                                    wxEvtHandler* handler,
                                    const wxString & url,
                                    int id):
-    wxWebRequestImpl(session, handler, id),
+    wxWebRequestImpl(session, sessionImpl, handler, id),
     m_sessionImpl(sessionImpl)
 {
     m_headerList = NULL;
diff --git a/src/msw/webrequest_winhttp.cpp b/src/msw/webrequest_winhttp.cpp
index ad22f08ad1..716e9af7f9 100644
--- a/src/msw/webrequest_winhttp.cpp
+++ b/src/msw/webrequest_winhttp.cpp
@@ -127,7 +127,7 @@ wxWebRequestWinHTTP::wxWebRequestWinHTTP(wxWebSession& session,
                                          wxEvtHandler* handler,
                                          const wxString& url,
                                          int id):
-    wxWebRequestImpl(session, handler, id),
+    wxWebRequestImpl(session, sessionImpl, handler, id),
     m_sessionImpl(sessionImpl),
     m_url(url),
     m_connect(NULL),
diff --git a/src/osx/webrequest_urlsession.mm b/src/osx/webrequest_urlsession.mm
index 822c65dda9..2bf4500b89 100644
--- a/src/osx/webrequest_urlsession.mm
+++ b/src/osx/webrequest_urlsession.mm
@@ -164,7 +164,7 @@ wxWebRequestURLSession::wxWebRequestURLSession(wxWebSession& session,
                                                wxEvtHandler* handler,
                                                const wxString& url,
                                                int winid):
-    wxWebRequestImpl(session, handler, winid),
+    wxWebRequestImpl(session, sessionImpl, handler, winid),
     m_sessionImpl(sessionImpl),
     m_url(url)
 {