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

Tor Bug Tracker & Wiki blackhole at torproject.org
Mon Apr 4 13:48:52 UTC 2016


#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:
Parent ID:                                  |     Resolution:
 Reviewer:                                  |  Actual Points:
                                            |         Points:
                                            |        Sponsor:  SponsorU
--------------------------------------------+------------------------------
Changes (by gk):

 * cc: mcs, brade (added)
 * keywords:  ff45-esr, TorBrowserTeam201603R => ff45-esr,
     TorBrowserTeam201604
 * status:  needs_review => needs_revision


Comment:

 b98f45490b533834cf19eddf474eef8658ba8921 -- okay (do we want to have the
 squash! line in the commit message?)

 5ff7a84ed956d430d853a29cea44b4d2d6422640 -- fixup ThirdPartyUtil like
 c42fc0680c470771a226d9005efe3989354f0b31 ?; whitespace; fix speculative
 connect
 -> Trac ticket?; indentation in nsUDPSocketProvider

 8e152d91164ac608acd0c8400bba5cf356d3f7ad -- drop (just conflict marker is
 left)
 2afa5f4a36b8f5af4b7b6ac82ce1d17d20002c40 -- merge with TB3 commit

 merge 498fa520a52d034bd403a1afe2db190fce17d421 and
 32ac145863c7b75dcf27d93200a600bd1bf0a2fb

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

 f4140e88fa1bb538844c0e020da4e716f73b1f50 -- fixup for ThirdPartyUtil?;
 LoadImage comment indentation

 ac802b13b44f2beebe681aae4ef011bc1351a4f3 -- update commit message FF45 ->
 FF52

 9d65a5039cd4c36149680a13285672897b07235d --

 -`nsCString isolationKey;` in GetFirstPartyHost() is unused
 -why do we have `static nsCString GetFirstParty(const GlobalObject&
 aGlobal);` in nsURL.h?
 -we should line wrap in `NS_GetStreamForMediaStreamURI` and
 `NS_GetSourceForMediaSourceURI` in
 nsHostObjectProtocolHandler.h;
 -what speaks against
 {{{
 +    if (NS_WARN_IF(NS_FAILED(rv))) {
 +      return nullptr;
 +    }
 }}}
 in `FetchRequest()`?
 -what speaks against
 {{{
 +        nsresult rv = GetFirstPartyHost(GetOwnerDocument(),
 isolationKey);
 +        if (NS_SUCCEEDED(rv)) {

          }
 }}}
 in `AfterSetAttr()` as well?



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

 cd84e61d2a13cb069558b30cca500f8260305f1e -- duckduckgo.xml is not removed;
 merge with 7f1e0d207b57441b6903b4faed25ef1339ac7b3d

 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. 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?

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


More information about the tor-bugs mailing list