664979 - Merge nsISHistory_2_0_BRANCH into nsISHistory

Status: RESOLVED FIXED

Description

[Ed Morley [:emorley]]

http://mxr.mozilla.org/mozilla-central/search?string=nsISHistory_2_0_BRANCH

Comment 1

[Ed Morley [:emorley]]

Created attachment 540190 [details] [diff] [review]
Merge nsISHistory_2_0_BRANCH

http://dev.philringnalda.com/tbpl/?tree=Try&rev=a03554955ed0

Thanks :-)

Comment 2

[Boris Zbarsky [:bzbarsky, bz on IRC]]

Comment on attachment 540190 [details] [diff] [review]
Merge nsISHistory_2_0_BRANCH

You don't need to change the history CID.  r=me with that change taken out.

Comment 3

[Ed Morley [:emorley]]

Created attachment 540219 [details] [diff] [review]
Merge nsISHistory_2_0_BRANCH v1.1

Updated for review comments, carrying forwards r+.

For whomever checks this in, it has passed try (comment 1) and has author/commit message set already. Thanks! :-)

Comment 4

[Ed Morley [:emorley]]

http://hg.mozilla.org/mozilla-central/rev/54cfcc5aeb7b

Comment 5

[[e-mail]]

Comment on attachment 540219 [details] [diff] [review]
Merge nsISHistory_2_0_BRANCH v1.1

>         browser.webNavigation.sessionHistory.
>-          QueryInterface(Ci.nsISHistory_2_0_BRANCH).reloadCurrentEntry();
>+          QueryInterface(Ci.nsISHistory).reloadCurrentEntry();
sessionHistory is already nsISHistory, no need to call QueryInterface again.

Comment 6

[Ed Morley [:emorley]]

Created attachment 540321 [details] [diff] [review]
Remove unnecessary QueryInterface call

Removes unnecessary QueryInterface(Ci.nsISHistory) call, per comment 5.

Thanks for spotting that Neil :-)

Comment 7

[Ed Morley [:emorley]]

http://dev.philringnalda.com/tbpl/?tree=Try&rev=0f7f8aa6e296

Comment 8

[Boris Zbarsky [:bzbarsky, bz on IRC]]

Comment on attachment 540321 [details] [diff] [review]
Remove unnecessary QueryInterface call

r=me

Comment 9

[Ed Morley [:emorley]]

Comment on attachment 540321 [details] [diff] [review]
Remove unnecessary QueryInterface call

Reopening so this shows on the checkin-needed searches.

Only the "Remove unnecessary QueryInterface call" patch is left to be landed - thanks! (Has passed try, see comment 7.

Comment 10

[Daniel Holbert [:dholbert]]

"Remove unnecessary QueryInterface call" patch landed:
http://hg.mozilla.org/integration/mozilla-inbound/rev/484adb0cf79b

Comment 11

[Marco Bonardo [::mak]]

http://hg.mozilla.org/mozilla-central/rev/484adb0cf79b

Comment 12

[Ed Morley [:emorley]]

I'm presuming this page needs updating:
https://developer.mozilla.org/en/NsISHistory

Comment 13

[Ed Morley [:emorley]]

Thanks Trevor :-)