1446607 - Port |Bug 1444760 - Combine loadURIWithFlags with loadURI|

Status: RESOLVED FIXED

(Thunderbird :: General, enhancement)

Description

[Jorg K (CEST = GMT+2)]

Bug 1444760 is about to land and we need to follow.

Basically loadURIWithFlags will be removed in the second patch of that bug and in the first patch the interface will be changed.

So while before the call accepted a list of arguments, it now accepts an object.

Before:
  loadURIWithFlags(uri, flags, null, null, null);
  loadURIWithFlags(aURI, flags, referrerURI, charset, postData);
  loadURIWithFlags(submission.uri.spec,
                   Ci.nsIWebNavigation.LOAD_FLAGS_NONE, null, null,
                   submission.postData);


Now:
  loadURI(uri, { flags });
  loadURIWithFlags(aURI, { flags, referrerURI, charset, postData });
  loadURI(submission.uri.spec, {
            flags: Ci.nsIWebNavigation.LOAD_FLAGS_NONE,
            postData: submission.postData });

So we see from the second example that the object properties are flags, referrerURI, charset, postData.

We need to modify all uses of these two functions:
https://dxr.mozilla.org/comm-central/search?q=loadURIWithFlags&redirect=false
One hit in mail/, nine hits in suite/ plus two comments.

I believe that the existing loadURI() calls don't need to be modified, since the flags object is optional.

Tim could you please confirm. In this case we have very little to do here.

Comment 1

[Jorg K (CEST = GMT+2)]

Attachment: 1446607-loadURI.patch (v1)

Comment 2

[Tim Nguyen :ntim]

Before bug 1444760, we had:

- loadURIWithFlags(aURI, flags, referrerURI, charset, postData); (last 3 are sometimes set to null)
- loadURIWithFlags(aURI, {flags, referrerURI, charset, postData}); (both forms were supported)
- loadURI(uri)
- loadURI(uri, aReferrerURI, aCharset) (last 2 are sometimes set to null)

After bug 1444760:
- loadURI(uri, {flags, referrerURI, postData});
- loadURI(uri, {flags, referrerURI, postData});
- loadURI(uri)
- loadURI(uri, {referrerURI})


Also, note that the charset argument seemed unused in m-c, and didn't seem to do anything in the binding, so I removed support for it too.


Another thing to take in consideration is that comm-central seems to have its own loadURIWithFlags, so you might either want to follow the m-c changes, or be more careful when changing the loadURIWithFlags calls.

Comment 3

[:aceman]

(In reply to Tim Nguyen :ntim from comment #2)
> Another thing to take in consideration is that comm-central seems to have
> its own loadURIWithFlags,

Where do you see this one?

Comment 4

[Tim Nguyen :ntim]

(In reply to :aceman from comment #3)
> (In reply to Tim Nguyen :ntim from comment #2)
> > Another thing to take in consideration is that comm-central seems to have
> > its own loadURIWithFlags,
> 
> Where do you see this one?

SM has its own tabbrowser.xml: https://dxr.mozilla.org/comm-central/source/suite/browser/tabbrowser.xml#2797

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/e2bf5fa4e5be
Port bug 1444760 - Combine loadURIWithFlags with loadURI, mail part. r=aceman

Comment 6

[Jorg K (CEST = GMT+2)]

FRG, here's more work for you. We've only done the simple stuff.

Comment 7

[Frank-Rainer Grahl (:frg)]

Thanks filed bug 1451078 for SeaMonkey.