Bug 1404734 - remove remaining use of nsIDOMHTMLImageElement from mailnews. r=aceman

This commit is contained in:
Jorg K 2017-10-02 09:43:25 +02:00
Родитель 39a0b74973
Коммит 4f34546979
3 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -19,12 +19,12 @@
#include "nsIDocShellTreeItem.h" #include "nsIDocShellTreeItem.h"
#include "nsIWebNavigation.h" #include "nsIWebNavigation.h"
#include "nsContentPolicyUtils.h" #include "nsContentPolicyUtils.h"
#include "nsIDOMHTMLImageElement.h"
#include "nsIFrameLoader.h" #include "nsIFrameLoader.h"
#include "nsIWebProgress.h" #include "nsIWebProgress.h"
#include "nsMsgUtils.h" #include "nsMsgUtils.h"
#include "nsThreadUtils.h" #include "nsThreadUtils.h"
#include "mozilla/mailnews/MimeHeaderParser.h" #include "mozilla/mailnews/MimeHeaderParser.h"
#include "mozilla/dom/HTMLImageElement.h"
#include "nsINntpUrl.h" #include "nsINntpUrl.h"
static const char kBlockRemoteImages[] = "mailnews.message_display.disable_remote_image"; static const char kBlockRemoteImages[] = "mailnews.message_display.disable_remote_image";
@ -672,8 +672,10 @@ void nsMsgContentPolicy::ComposeShouldLoad(nsIMsgCompose *aMsgCompose,
{ {
bool insertingQuotedContent = true; bool insertingQuotedContent = true;
aMsgCompose->GetInsertingQuotedContent(&insertingQuotedContent); aMsgCompose->GetInsertingQuotedContent(&insertingQuotedContent);
nsCOMPtr<nsIDOMHTMLImageElement> imageElement(do_QueryInterface(aRequestingContext)); nsCOMPtr<Element> element = do_QueryInterface(aRequestingContext);
if (imageElement) RefPtr<mozilla::dom::HTMLImageElement> image =
mozilla::dom::HTMLImageElement::FromContentOrNull(element);
if (image)
{ {
if (!insertingQuotedContent) if (!insertingQuotedContent)
{ {

Просмотреть файл

@ -8,7 +8,6 @@
#include "nsIDOMNode.h" #include "nsIDOMNode.h"
#include "nsIDOMNodeList.h" #include "nsIDOMNodeList.h"
#include "nsIDOMText.h" #include "nsIDOMText.h"
#include "nsIDOMHTMLImageElement.h"
#include "nsPIDOMWindow.h" #include "nsPIDOMWindow.h"
#include "mozIDOMWindow.h" #include "mozIDOMWindow.h"
#include "nsISelectionController.h" #include "nsISelectionController.h"

Просмотреть файл

@ -27,7 +27,6 @@
#include "nsMsgCopy.h" #include "nsMsgCopy.h"
#include "nsUnicharUtils.h" #include "nsUnicharUtils.h"
#include "nsMsgPrompts.h" #include "nsMsgPrompts.h"
#include "nsIDOMHTMLImageElement.h"
#include "nsCExternalHandlerService.h" #include "nsCExternalHandlerService.h"
#include "nsIMIMEService.h" #include "nsIMIMEService.h"
#include "nsIDocument.h" #include "nsIDocument.h"