Bug 1600451 - Port bug 1600362: add namespace to Element class. r=KaiE
authoraceman <acelists@atlas.sk>
Sat, 30 Nov 2019 19:20:29 +0100
changeset 36756 5f1b51ad26efeabc949db3a3c23564f59d933930
parent 36755 377bb360e57c7a00db30df65402231f6b901a50f
child 36757 693ecddb204ff925eb351f44f38b0442e76214f9
push id2534
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:52:51 +0000
treeherdercomm-beta@055c50840778 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersKaiE
bugs1600451, 1600362
Bug 1600451 - Port bug 1600362: add namespace to Element class. r=KaiE
mailnews/base/src/nsMsgContentPolicy.cpp
mailnews/base/src/nsMsgMailSession.cpp
--- a/mailnews/base/src/nsMsgContentPolicy.cpp
+++ b/mailnews/base/src/nsMsgContentPolicy.cpp
@@ -707,17 +707,17 @@ void nsMsgContentPolicy::ComposeShouldLo
     // Special case image elements. When replying to a message, we want to allow
     // the user to add remote images to the message. But we don't want remote
     // images that are a part of the quoted content to load. Hence we block them
     // while the reply is created (insertingQuotedContent==true), but allow them
     // later when the user inserts them.
     if (*aDecision == nsIContentPolicy::REJECT_REQUEST) {
       bool insertingQuotedContent = true;
       aMsgCompose->GetInsertingQuotedContent(&insertingQuotedContent);
-      nsCOMPtr<Element> element = do_QueryInterface(aRequestingContext);
+      nsCOMPtr<mozilla::dom::Element> element = do_QueryInterface(aRequestingContext);
       RefPtr<mozilla::dom::HTMLImageElement> image =
           mozilla::dom::HTMLImageElement::FromNodeOrNull(element);
       if (image) {
         if (!insertingQuotedContent) {
           *aDecision = nsIContentPolicy::ACCEPT;
           return;
         }
 
--- a/mailnews/base/src/nsMsgMailSession.cpp
+++ b/mailnews/base/src/nsMsgMailSession.cpp
@@ -254,17 +254,17 @@ nsresult nsMsgMailSession::GetTopmostMsg
 
       topMostWindow = do_QueryInterface(windowSupports, &rv);
       NS_ENSURE_SUCCESS(rv, rv);
       NS_ENSURE_TRUE(topMostWindow, NS_ERROR_FAILURE);
 
       mozilla::dom::Document *domDocument = topMostWindow->GetDoc();
       NS_ENSURE_TRUE(domDocument, NS_ERROR_FAILURE);
 
-      Element *domElement = domDocument->GetDocumentElement();
+      mozilla::dom::Element *domElement = domDocument->GetDocumentElement();
       NS_ENSURE_TRUE(domElement, NS_ERROR_FAILURE);
 
       domElement->GetAttribute(NS_LITERAL_STRING("windowtype"), windowType);
       if (windowType.EqualsLiteral("mail:3pane") ||
           windowType.EqualsLiteral("mail:messageWindow"))
         break;
 
       windowEnum->HasMoreElements(&more);