1433363 - Port the changes from bug 1418076 [Remove nsIDOMHTMLDocument] to comm-central

Status: RESOLVED FIXED

(Thunderbird :: General, enhancement)

Description

[Boris Zbarsky [:bzbarsky]]

The following files are affected:

* editor/ui/composer/content/editorApplicationOverlay.js
* editor/ui/composer/content/editorUtilities.js
* mail/base/content/specialTabs.js

All three of those need to replace instanceof Ci.nsIDOMHTMLDocument with ChromeUtils.getClassName checks.  Also:

* mailnews/compose/src/nsMsgComposeService.cpp
* suite/smile/public/smileIApplication.idl

nsMsgComposeService just has a #include that can go away, I think.  I'm not sure what smileIApplication.idl is used for, if anything.

Comment 1

[Jorg K (CEST = GMT+2)]

FRG, I won't do the SM part, since I can't test that.

Comment 2

[Jorg K (CEST = GMT+2)]

Attachment: 1433363-nsIDOMHTMLDocument.patch (v1) WIP

Sorry to trouble you with this. I think class checks won't do it here
https://dxr.mozilla.org/comm-central/rev/2b56d89a8792fc1af6ae66be5f38cd9d26ecb7e1/editor/ui/composer/content/editorUtilities.js#671
and here:
https://dxr.mozilla.org/comm-central/rev/2b56d89a8792fc1af6ae66be5f38cd9d26ecb7e1/editor/ui/composer/content/editorApplicationOverlay.js#134

Somehow they want to get the URL from the document.

Comment 3

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 8945881 [details] [diff] [review]
1433363-nsIDOMHTMLDocument.patch (v1) WIP

This looks fine.

> Somehow they want to get the URL from the document.

OK, so what?  This bit:

    var aDOMHTMLDoc = GetCurrentEditor().document.QueryInterface(Components.interfaces.nsIDOMHTMLDocument);
    return aDOMHTMLDoc.URL;

Can be rewritten as:

    return GetCurrentEditor().document.URL;

because "URL" is on the Document interface anyway.  Same for the other thing that wants .URL; that QI is just useless noise.

Comment 4

[Jorg K (CEST = GMT+2)]

Attachment: 1433363-nsIDOMHTMLDocument.patch (v2)

I hope you don't mind looking over two more hunks so we're done here.

Comment 5

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 8945889 [details] [diff] [review]
1433363-nsIDOMHTMLDocument.patch (v2)

r=me

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/454c0dee5033
Port bug 1418076: Remove use of nsIDOMHTMLDocument. r=bz

Comment 7

[Jorg K (CEST = GMT+2)]

Thanks Boris.

Fixed indentation and replaced invalid !=== with !== here:
https://hg.mozilla.org/comm-central/rev/454c0dee5033#l3.14

Comment 8

[Frank-Rainer Grahl (:frg)]

IanN, should I fix smile again or get rid of it? Any add-on which used it is probably broken by now. SeaMonkey no longer uses it.

...
All three of those need to replace instanceof Ci.nsIDOMHTMLDocument with ChromeUtils.getClassName checks.  Also:

smileIApplication.idl is used for, if anything.

Comment 9

[Ian Neal]

(In reply to Frank-Rainer Grahl (:frg) from comment #8)
> IanN, should I fix smile again or get rid of it? Any add-on which used it is
> probably broken by now. SeaMonkey no longer uses it.
> 
> ...
> All three of those need to replace instanceof Ci.nsIDOMHTMLDocument with
> ChromeUtils.getClassName checks.  Also:
> 
> smileIApplication.idl is used for, if anything.

Let's ditch the smile :(