940194 - Build netwerk/cookie in unified mode

Status: RESOLVED FIXED

(Core :: Networking: Cookies, defect)

Comment 1

[Michael]

Attachment: Patch

Anyone else need to review this?

Comment 2

[Chris Peterson [:cpeterson]]

I think this code change will be brittle because the unified network/cookie .cpp file will have two global variables called `gCookieService`: CookieChildService.cpp declares a CookieServiceChild* called gCookieService in the mozilla::net namespace and nsCookieService.cpp declares a nsCookieService* called gCookieService in the global namespace. nsCookieService.cpp also pulls the first gCookieService variable into the global namespace with `using namespace mozilla::net`.

Comment 3

[Chris Peterson [:cpeterson]]

I had a WIP patch for netwerk/cookie and, to avoid the gCookieService name conflicts, I renamed CookieServiceChild.cpp's gCookieService to sCookieServiceChild and made sCookieServiceChild a private static member of class CookieServiceChild.

I also consolidated the duplicated behavior and pref constants into a shared definition in CookieServiceChild.h.

Comment 4

[(no longer active)]

Comment on attachment 8334345 [details] [diff] [review]
Patch

Review of attachment 8334345 [details] [diff] [review]:
-----------------------------------------------------------------

I agree with what Chris said.  :-)

Comment 5

[Michael]

Attachment: Patch (v2)

Comment 6

[Michael]

Attachment: Patch for checkin. r=ehsan

Comment 7

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/e2536905b186

Comment 8

[Ryan VanderMeulen [:RyanVM]]

Backed out for bustage.
https://hg.mozilla.org/integration/mozilla-inbound/rev/85e1efd3e28b

https://tbpl.mozilla.org/php/getParsedLog.php?id=30893804&tree=Mozilla-Inbound

Comment 9

[(no longer active)]

Michael, are you planning to update your patch here?  Thanks!

Comment 10

[Michael]

Yeah, might be a day or two though. :(

Comment 11

[(no longer active)]

(In reply to comment #10)
> Yeah, might be a day or two though. :(

No rush, just wanted to check wit you to see if I need to pick this up!  Thanks :-)

Comment 12

[Michael]

I guess you should take this. The linker is not being friendly to me right now...

Comment 13

[Chris Peterson [:cpeterson]]

Attachment: unify-netwerk-cookie.patch

This patch was much simpler than I expected: nsCookieService.cpp can't be unified because it #defines FORCE_PR_LOG and, conveniently, all the symbol name conflicts were between nsCookieService.cpp and CookieChildService.cpp. No code changes are necessary.

Comment 14

[(no longer active)]

Comment on attachment 8341560 [details] [diff] [review]
unify-netwerk-cookie.patch

Review of attachment 8341560 [details] [diff] [review]:
-----------------------------------------------------------------

Yeah, that's what I suspected.

Comment 15

[Chris Peterson [:cpeterson]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/96800b422285

Comment 16

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/96800b422285