Bug 1521671 - Port bug 1514340: Implement nsIWebProgressListener.onContentBlockingEvent(), C++ part. rs=bustage-fix
authorJorg K <jorgk@jorgk.com>
Tue, 22 Jan 2019 09:53:29 +0100
changeset 34268 995656d1fb108b518f5b3b7f38222fe05efd51c3
parent 34267 1c11a287b63969bba542082cf328b9301a757e5d
child 34269 f00434eba47a01e79c2ad037578b089a3b017572
push id389
push userclokep@gmail.com
push dateMon, 18 Mar 2019 19:01:53 +0000
reviewersbustage-fix
bugs1521671, 1514340
Bug 1521671 - Port bug 1514340: Implement nsIWebProgressListener.onContentBlockingEvent(), 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
@@ -1049,16 +1049,23 @@ nsMsgContentPolicy::OnStatusChange(nsIWe
 
 NS_IMETHODIMP
 nsMsgContentPolicy::OnSecurityChange(nsIWebProgress *aWebProgress,
                                      nsIRequest *aRequest, uint32_t aState)
 {
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsMsgContentPolicy::OnContentBlockingEvent(nsIWebProgress *aWebProgress,
+                                           nsIRequest *aRequest, uint32_t aEvent)
+{
+  return NS_OK;
+}
+
 /**
  * Implementation of nsIMsgContentPolicy
  *
  */
 NS_IMETHODIMP
 nsMsgContentPolicy::AddExposedProtocol(const nsACString &aScheme)
 {
   if (mCustomExposedProtocols.Contains(nsCString(aScheme)))
--- a/mailnews/base/src/nsMsgPrintEngine.cpp
+++ b/mailnews/base/src/nsMsgPrintEngine.cpp
@@ -209,16 +209,24 @@ nsMsgPrintEngine::OnSecurityChange(nsIWe
                                    nsIRequest *aRequest,
                                    uint32_t state)
 {
     MOZ_ASSERT_UNREACHABLE("notification excluded in AddProgressListener(...)");
     return NS_OK;
 }
 
 NS_IMETHODIMP
+nsMsgPrintEngine::OnContentBlockingEvent(nsIWebProgress *aWebProgress,
+                                         nsIRequest *aRequest, uint32_t aEvent)
+{
+  MOZ_ASSERT_UNREACHABLE("notification excluded in AddProgressListener(...)");
+  return NS_OK;
+}
+
+NS_IMETHODIMP
 nsMsgPrintEngine::SetWindow(mozIDOMWindowProxy *aWin)
 {
   if (!aWin)
   {
     // It isn't an error to pass in null for aWin, in fact it means we are shutting
     // down and we should start cleaning things up...
     return NS_OK;
   }
--- a/mailnews/base/src/nsMsgProgress.cpp
+++ b/mailnews/base/src/nsMsgProgress.cpp
@@ -177,16 +177,23 @@ NS_IMETHODIMP nsMsgProgress::OnStatusCha
 }
 
 /* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long state); */
 NS_IMETHODIMP nsMsgProgress::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t state)
 {
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsMsgProgress::OnContentBlockingEvent(nsIWebProgress *aWebProgress,
+                                      nsIRequest *aRequest, uint32_t aEvent)
+{
+  return NS_OK;
+}
+
 nsresult nsMsgProgress::ReleaseListeners()
 {
   m_listenerList.Clear();
   return NS_OK;
 }
 
 NS_IMETHODIMP nsMsgProgress::ShowStatusString(const nsAString& aStatus)
 {
--- a/mailnews/base/src/nsMsgStatusFeedback.cpp
+++ b/mailnews/base/src/nsMsgStatusFeedback.cpp
@@ -167,16 +167,22 @@ nsMsgStatusFeedback::OnStatusChange(nsIW
 NS_IMETHODIMP
 nsMsgStatusFeedback::OnSecurityChange(nsIWebProgress *aWebProgress,
                                     nsIRequest *aRequest,
                                     uint32_t state)
 {
     return NS_OK;
 }
 
+NS_IMETHODIMP
+nsMsgStatusFeedback::OnContentBlockingEvent(nsIWebProgress *aWebProgress,
+                                            nsIRequest *aRequest, uint32_t aEvent)
+{
+  return NS_OK;
+}
 
 NS_IMETHODIMP
 nsMsgStatusFeedback::ShowStatusString(const nsAString& aStatus)
 {
   nsCOMPtr<nsIMsgStatusFeedback> jsStatusFeedback(do_QueryReferent(mJSStatusFeedbackWeak));
   if (jsStatusFeedback)
     jsStatusFeedback->ShowStatusString(aStatus);
   return NS_OK;
--- a/mailnews/compose/src/nsMsgCompose.cpp
+++ b/mailnews/compose/src/nsMsgCompose.cpp
@@ -4116,16 +4116,24 @@ NS_IMETHODIMP nsMsgComposeSendListener::
 
 /* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long state); */
 NS_IMETHODIMP nsMsgComposeSendListener::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t state)
 {
   /* Ignore this call */
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsMsgComposeSendListener::OnContentBlockingEvent(nsIWebProgress *aWebProgress,
+                                                 nsIRequest *aRequest, uint32_t aEvent)
+{
+  /* Ignore this call */
+  return NS_OK;
+}
+
 nsresult
 nsMsgCompose::ConvertHTMLToText(nsIFile *aSigFile, nsString &aSigData)
 {
   nsAutoString origBuf;
 
   nsresult rv = LoadDataFromFile(aSigFile, origBuf);
   NS_ENSURE_SUCCESS (rv, rv);
 
--- a/mailnews/compose/src/nsURLFetcher.cpp
+++ b/mailnews/compose/src/nsURLFetcher.cpp
@@ -400,16 +400,23 @@ NS_IMETHODIMP
 nsURLFetcher::OnSecurityChange(nsIWebProgress *aWebProgress,
                                nsIRequest *aRequest,
                                uint32_t state)
 {
   MOZ_ASSERT_UNREACHABLE("notification excluded in AddProgressListener(...)");
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsURLFetcher::OnContentBlockingEvent(nsIWebProgress *aWebProgress,
+                                     nsIRequest *aRequest, uint32_t aEvent)
+{
+  MOZ_ASSERT_UNREACHABLE("notification excluded in AddProgressListener(...)");
+  return NS_OK;
+}
 
 /**
  * Stream consumer used for handling special content type like multipart/x-mixed-replace
  */
 
 NS_IMPL_ISUPPORTS(nsURLFetcherStreamConsumer, nsIStreamListener, nsIRequestObserver)
 
 nsURLFetcherStreamConsumer::nsURLFetcherStreamConsumer(nsURLFetcher* urlFetcher) :