[tor-bugs] #15197 [Tor Browser]: Rebase Tor Browser patches to ESR 45

[Tor Bug Tracker & Wiki]

#15197: Rebase Tor Browser patches to ESR 45
-------------------------------------------------+-------------------------
 Reporter:  gk                                   |          Owner:
     Type:  task                                 |  arthuredelstein
 Priority:  Very High                            |         Status:
Component:  Tor Browser                          |  needs_revision
 Severity:  Critical                             |      Milestone:
 Keywords:  ff45-esr, TorBrowserTeam201604,      |        Version:
  tbb-6.0a5                                      |     Resolution:
Parent ID:                                       |  Actual Points:
 Reviewer:                                       |         Points:
                                                 |        Sponsor:
                                                 |  SponsorU
-------------------------------------------------+-------------------------

Comment (by arthuredelstein):

 Replying to [comment:19 gk]:
 > b98f45490b533834cf19eddf474eef8658ba8921 -- okay (do we want to have the
 squash! line in the commit message?)

 Fixed the commit message.

 > 5ff7a84ed956d430d853a29cea44b4d2d6422640 -- fixup ThirdPartyUtil like
 > c42fc0680c470771a226d9005efe3989354f0b31 ?

 Good idea -- I have now done that for the ThirdPartyUtil changes in OCSP
 and favicons

 > whitespace; fix speculative connect -> Trac ticket?;

 #18762

 > indentation in nsUDPSocketProvider

 Fixed.

 > 8e152d91164ac608acd0c8400bba5cf356d3f7ad -- drop (just conflict marker
 is left)

 Dropped.

 > 2afa5f4a36b8f5af4b7b6ac82ce1d17d20002c40 -- merge with TB3 commit

 Done.

 > merge 498fa520a52d034bd403a1afe2db190fce17d421 and
 32ac145863c7b75dcf27d93200a600bd1bf0a2fb

 Done.

 > 224013acae734e76a543cc3b327a00011be26f15 -- we don't need `+ // return
 0;` anymore?

 Yes, we don't. I'm not sure why this line was changed, but I don't think
 there is any need to modify the default behavior. We could consider fixing
 up the 38ESR branch to uncomment the line, but I don't think it's doing
 any harm either.

 > f4140e88fa1bb538844c0e020da4e716f73b1f50 -- fixup for ThirdPartyUtil?;

 Fixed (as mentioned above).

 > LoadImage comment indentation

 Fixed.

 > ac802b13b44f2beebe681aae4ef011bc1351a4f3 -- update commit message FF45
 -> FF52

 Fixed.

 > 9d65a5039cd4c36149680a13285672897b07235d --
 >
 > -`nsCString isolationKey;` in GetFirstPartyHost() is unused

 Fixed.

 > -why do we have `static nsCString GetFirstParty(const GlobalObject&
 aGlobal);` in nsURL.h?

 Oops -- removed.

 > -we should line wrap in `NS_GetStreamForMediaStreamURI` and
 `NS_GetSourceForMediaSourceURI` in
 > nsHostObjectProtocolHandler.h;

 Done.

 > -what speaks against
 > {{{
 > +    if (NS_WARN_IF(NS_FAILED(rv))) {
 > +      return nullptr;
 > +    }
 > }}}
 > in `FetchRequest()`?

 Good idea -- added.

 > -what speaks against
 > {{{
 > +        nsresult rv = GetFirstPartyHost(GetOwnerDocument(),
 isolationKey);
 > +        if (NS_SUCCEEDED(rv)) {
 >
 >          }
 > }}}
 > in `AfterSetAttr()` as well?

 Also added.

 > 810cfbfe2bc3531478b6c266e66eee28aaa79392 --
 > {{{
 > +                gfxFontEntry* fe =
 > +
 gfxPlatform::GetPlatform()->LookupLocalFont(currSrc.mLocalName,
 > }}}
 > just: "fe ="

 Fixed.

 > cd84e61d2a13cb069558b30cca500f8260305f1e -- duckduckgo.xml is not
 removed;

 Fixed.

 > merge with 7f1e0d207b57441b6903b4faed25ef1339ac7b3d

 Done.

 > Okay, I think I have looked at all non mcs/brade commits. Nice work,
 Arthur! If there are things unclear with my remarks let me know. Not sure
 whether treating the ThirdPartyUtil related things with fixup commits is
 worth it, but I guess it might be cleaner that way.

 I have now merged all ThirdPartyUtil-related code into a single patch.

 > If we have time it might be good if mcs/brade could look over
 9d65a5039cd4c36149680a13285672897b07235d as well.

 > Did we need to adapt the tests for #15502?

 I will check all tests again after fixing the mcs/brade patches.

 Here's the new version: https://github.com/arthuredelstein/tor-
 browser/commits/15197+9
 hash: 92d3f1214681c45f66c446a122066a30a83919b2
 This includes the changes made for 15197+8.

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/15197#comment:39>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online