Bug 1495184 - Port 1493563: Adapt to API changes in nsIWebProgressListener.onSecurityChange(), C++ part. rs=bustage-fix
authorJorg K <jorgk@jorgk.com>
Sat, 29 Sep 2018 10:39:29 +0200
changeset 33269 17f0a541d7acf332ba8c503025277932d3b9936b
parent 33268 d945c1cb9d917bfaa6d4d8bfacecde30889567cc
child 33270 759a21c4e0f95f324a865735ca7d1a84039cba53
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersbustage-fix
bugs1495184, 1493563
Bug 1495184 - Port 1493563: Adapt to API changes in nsIWebProgressListener.onSecurityChange(), C++ part. rs=bustage-fix
mailnews/base/src/nsMsgContentPolicy.cpp
mailnews/base/src/nsMsgPrintEngine.cpp
mailnews/base/src/nsMsgProgress.cpp
mailnews/base/src/nsMsgStatusFeedback.cpp
mailnews/compose/src/nsMsgCompose.cpp
mailnews/compose/src/nsURLFetcher.cpp
--- a/mailnews/base/src/nsMsgContentPolicy.cpp
+++ b/mailnews/base/src/nsMsgContentPolicy.cpp
@@ -1053,17 +1053,20 @@ nsMsgContentPolicy::OnStatusChange(nsIWe
                                    nsIRequest *aRequest, nsresult aStatus,
                                    const char16_t *aMessage)
 {
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsMsgContentPolicy::OnSecurityChange(nsIWebProgress *aWebProgress,
-                                     nsIRequest *aRequest, uint32_t aState)
+                                     nsIRequest *aRequest,
+                                     uint32_t aOldState,
+                                     uint32_t aState,
+                                     const nsAString& aContentBlockingLogJSON)
 {
   return NS_OK;
 }
 
 /**
  * Implementation of nsIMsgContentPolicy
  *
  */
--- a/mailnews/base/src/nsMsgPrintEngine.cpp
+++ b/mailnews/base/src/nsMsgPrintEngine.cpp
@@ -200,18 +200,20 @@ nsMsgPrintEngine::OnStatusChange(nsIWebP
                     const char16_t* aMessage)
 {
     return NS_OK;
 }
 
 
 NS_IMETHODIMP
 nsMsgPrintEngine::OnSecurityChange(nsIWebProgress *aWebProgress,
-                      nsIRequest *aRequest,
-                      uint32_t state)
+                                   nsIRequest *aRequest,
+                                   uint32_t aOldState,
+                                   uint32_t aState,
+                                   const nsAString& aContentBlockingLogJSON)
 {
     MOZ_ASSERT_UNREACHABLE("notification excluded in AddProgressListener(...)");
     return NS_OK;
 }
 
 NS_IMETHODIMP
 nsMsgPrintEngine::SetWindow(mozIDOMWindowProxy *aWin)
 {
--- a/mailnews/base/src/nsMsgProgress.cpp
+++ b/mailnews/base/src/nsMsgProgress.cpp
@@ -172,17 +172,19 @@ NS_IMETHODIMP nsMsgProgress::OnStatusCha
   if (aMessage && *aMessage)
     m_pendingStatus = aMessage;
   for (int32_t i = m_listenerList.Count() - 1; i >= 0; i --)
     m_listenerList[i]->OnStatusChange(aWebProgress, aRequest, aStatus, aMessage);
   return NS_OK;
 }
 
 /* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long state); */
-NS_IMETHODIMP nsMsgProgress::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t state)
+NS_IMETHODIMP nsMsgProgress::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest,
+                                              uint32_t aOldState, uint32_t aState,
+                                              const nsAString& aContentBlockingLogJSON)
 {
   return NS_OK;
 }
 
 nsresult nsMsgProgress::ReleaseListeners()
 {
   m_listenerList.Clear();
   return NS_OK;
--- a/mailnews/base/src/nsMsgStatusFeedback.cpp
+++ b/mailnews/base/src/nsMsgStatusFeedback.cpp
@@ -161,18 +161,20 @@ nsMsgStatusFeedback::OnStatusChange(nsIW
                                     const char16_t* aMessage)
 {
     return NS_OK;
 }
 
 
 NS_IMETHODIMP
 nsMsgStatusFeedback::OnSecurityChange(nsIWebProgress *aWebProgress,
-                                    nsIRequest *aRequest,
-                                    uint32_t state)
+                                      nsIRequest *aRequest,
+                                      uint32_t aOldState,
+                                      uint32_t aState,
+                                      const nsAString& aContentBlockingLogJSON)
 {
     return NS_OK;
 }
 
 
 NS_IMETHODIMP
 nsMsgStatusFeedback::ShowStatusString(const nsAString& aStatus)
 {
--- a/mailnews/compose/src/nsMsgCompose.cpp
+++ b/mailnews/compose/src/nsMsgCompose.cpp
@@ -4077,18 +4077,19 @@ NS_IMETHODIMP nsMsgComposeSendListener::
 /* void onStatusChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage); */
 NS_IMETHODIMP nsMsgComposeSendListener::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsresult aStatus, const char16_t *aMessage)
 {
   /* Ignore this call */
   return NS_OK;
 }
 
 /* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long state); */
-NS_IMETHODIMP nsMsgComposeSendListener::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t state)
-{
+NS_IMETHODIMP nsMsgComposeSendListener::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest,
+                                                         uint32_t aOldState, uint32_t aState,
+                                                         const nsAString& aContentBlockingLogJSON) {
   /* Ignore this call */
   return NS_OK;
 }
 
 nsresult
 nsMsgCompose::ConvertHTMLToText(nsIFile *aSigFile, nsString &aSigData)
 {
   nsAutoString origBuf;
--- a/mailnews/compose/src/nsURLFetcher.cpp
+++ b/mailnews/compose/src/nsURLFetcher.cpp
@@ -394,17 +394,19 @@ nsURLFetcher::OnStatusChange(nsIWebProgr
 {
   MOZ_ASSERT_UNREACHABLE("notification excluded in AddProgressListener(...)");
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsURLFetcher::OnSecurityChange(nsIWebProgress *aWebProgress,
                                nsIRequest *aRequest,
-                               uint32_t state)
+                               uint32_t aOldState,
+                               uint32_t aState,
+                               const nsAString& aContentBlockingLogJSON)
 {
   MOZ_ASSERT_UNREACHABLE("notification excluded in AddProgressListener(...)");
   return NS_OK;
 }
 
 
 /**
  * Stream consumer used for handling special content type like multipart/x-mixed-replace