1447940 - Port bug 1444143 and bug 1447098 to TB: Replace use of nsIFrameLoader and rename FromContent to FromNode

Status: RESOLVED FIXED

(MailNews Core :: Composition, enhancement)

Description

[Richard Marti (:Paenglab)]

Both bugs need to be ported.

Comment 1

[Richard Marti (:Paenglab)]

Attachment: Bustage.patch

This is my approach with my zero C++ skills.

It still fails with:

 0:20.58 nsMsgContentPolicy.cpp
 0:20.58 z:/Mozilla/comm-central/mailnews/base/src/nsMsgContentPolicy.cpp(757): error C2039: 'GetFrameLoaderXPCOM': is not a member of 'nsIFrameLoaderOwner'
 0:20.58 z:/Mozilla/TB/dist/include\nsIFrameLoaderOwner.h(28): note: see declaration of 'nsIFrameLoaderOwner'
 0:20.58 z:/Mozilla/comm-central/mailnews/base/src/nsMsgContentPolicy.cpp(762): error C2027: use of undefined type 'nsFrameLoader'
 0:20.58 z:\mozilla\tb\dist\include\nsIMessageManager.h(29): note: see declaration of 'nsFrameLoader'
 0:20.58 z:/Mozilla/comm-central/mailnews/base/src/nsMsgContentPolicy.cpp(762): error C2039: 'GetDocShell': is not a member of 'nsCOMPtr<nsFrameLoader>'
 0:20.58 z:/Mozilla/comm-central/mailnews/base/src/nsMsgContentPolicy.cpp(756): note: see declaration of 'nsCOMPtr<nsFrameLoader>'

Comment 2

[Jorg K (CEST = GMT+2)]

Yes, GetFrameLoaderXPCOM() was removed:
https://hg.mozilla.org/integration/mozilla-inbound/rev/f550087a772e#l1.19
https://hg.mozilla.org/integration/mozilla-inbound/rev/f550087a772e#l3.13

So we really need advice from Boris.

Comment 3

[Jorg K (CEST = GMT+2)]

Attachment: Bustage.patch (v2)

This goes closer, now only: 'IgnoreErrors': identifier not found

Comment 4

[Jorg K (CEST = GMT+2)]

Attachment: Bustage.patch

That does the job.

Comment 5

[Jorg K (CEST = GMT+2)]

https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=e243a2f8ddb9068d476a473caa33bb963853e316

Comment 6

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 8961407 [details] [diff] [review]
Bustage.patch

>+        mozilla::dom::HTMLImageElement::FromNodeOrNull(element);

This is to do with bug 1447098, but ok.  Sorry, I should have realized comm-central used FromContent....

>+  RefPtr<nsFrameLoader> frameLoader = flOwner ?

flOwner shouldn't be null here, since the QI succeeded.  The old code certainly didn't null-check.  Just drop the null-check, please:

  RefPtr<nsFrameLoader> frameLoader = flOwner->GetFrameLoader();

Also, you need to use mozilla::dom::nsFrameLoader as the type, no?  Or add some "using" declarations to make it simpler.

r=me.  Thank you for dealing with this!

Comment 7

[Jorg K (CEST = GMT+2)]

(In reply to Boris Zbarsky [:bz] (no decent commit message means r-) from comment #6)
> Also, you need to use mozilla::dom::nsFrameLoader as the type, no?
Apparently not since it compiles like this: RefPtr<nsFrameLoader> frameLoader = flOwner->GetFrameLoader();
RefPtr<mozilla::dom::nsFrameLoader> frameLoader = flOwner->GetFrameLoader();
doesn't compile.

nsFrameLoader.h just has |class nsFrameLoader final :|.

So I'll land this just with the null-check removed.

Comment 8

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/5c4b9489b3ba
Port bug 1444143 and bug 1447098 to TB: Replace use of nsIFrameLoader and rename FromContent to FromNode. r=bz

Comment 9

[Boris Zbarsky [:bzbarsky]]

Oh, I forgot that nsFrameLoader is not namespaced.  OK.  I keep thinking it's already mozilla::dom::FrameLoader.  ;)