Backed out changeset e2536905b186 (bug 940194) for bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 21 Nov 2013 09:38:59 -0500
changeset 171418 85e1efd3e28b47a5a88fd76bdd8b8cc5a969aba2
parent 171417 43c41041fe372ade34f0a5fba3f9a81fb90cf05d
child 171419 7aaec497f1ed4fd56ba9bbb1d8c790ffa734c7e9
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs940194
milestone28.0a1
backs oute2536905b18620140f61d1552003299bf4a1250e
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset e2536905b186 (bug 940194) for bustage.
netwerk/cookie/CookieServiceChild.cpp
netwerk/cookie/CookieServiceChild.h
netwerk/cookie/moz.build
--- a/netwerk/cookie/CookieServiceChild.cpp
+++ b/netwerk/cookie/CookieServiceChild.cpp
@@ -23,24 +23,26 @@ static const int32_t BEHAVIOR_REJECTFORE
 // static const int32_t BEHAVIOR_REJECT = 2;
 static const int32_t BEHAVIOR_LIMITFOREIGN = 3;
 
 // Pref string constants
 static const char kPrefCookieBehavior[] = "network.cookie.cookieBehavior";
 static const char kPrefThirdPartySession[] =
   "network.cookie.thirdparty.sessionOnly";
 
+static CookieServiceChild *gCookieService;
+
 CookieServiceChild*
 CookieServiceChild::GetSingleton()
 {
-  if (!sCookieServiceChild)
-    sCookieServiceChild = new CookieServiceChild();
+  if (!gCookieService)
+    gCookieService = new CookieServiceChild();
 
-  NS_ADDREF(sCookieServiceChild);
-  return sCookieServiceChild;
+  NS_ADDREF(gCookieService);
+  return gCookieService;
 }
 
 NS_IMPL_ISUPPORTS3(CookieServiceChild,
                    nsICookieService,
                    nsIObserver,
                    nsISupportsWeakReference)
 
 CookieServiceChild::CookieServiceChild()
@@ -64,17 +66,17 @@ CookieServiceChild::CookieServiceChild()
     prefBranch->AddObserver(kPrefCookieBehavior, this, true);
     prefBranch->AddObserver(kPrefThirdPartySession, this, true);
     PrefChanged(prefBranch);
   }
 }
 
 CookieServiceChild::~CookieServiceChild()
 {
-  sCookieServiceChild = nullptr;
+  gCookieService = nullptr;
 }
 
 void
 CookieServiceChild::PrefChanged(nsIPrefBranch *aPrefBranch)
 {
   int32_t val;
   if (NS_SUCCEEDED(aPrefBranch->GetIntPref(kPrefCookieBehavior, &val)))
     mCookieBehavior =
--- a/netwerk/cookie/CookieServiceChild.h
+++ b/netwerk/cookie/CookieServiceChild.h
@@ -26,19 +26,16 @@ public:
   NS_DECL_NSICOOKIESERVICE
   NS_DECL_NSIOBSERVER
 
   CookieServiceChild();
   virtual ~CookieServiceChild();
 
   static CookieServiceChild* GetSingleton();
 
-private:
-  static CookieServiceChild *sCookieServiceChild;
-
 protected:
   void SerializeURIs(nsIURI *aHostURI,
                      nsIChannel *aChannel,
                      nsCString &aHostSpec,
                      nsCString &aHostCharset,
                      nsCString &aOriginatingSpec,
                      nsCString &aOriginatingCharset);
 
--- a/netwerk/cookie/moz.build
+++ b/netwerk/cookie/moz.build
@@ -18,17 +18,17 @@ XPIDL_MODULE = 'necko_cookie'
 
 if CONFIG['NECKO_COOKIES']:
     MSVC_ENABLE_PGO = True
 
     EXPORTS.mozilla.net = [
         'CookieServiceChild.h',
         'CookieServiceParent.h',
     ]
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'CookieServiceChild.cpp',
         'CookieServiceParent.cpp',
         'nsCookie.cpp',
         'nsCookieService.cpp',
     ]
 
 if CONFIG['NECKO_COOKIES']:
     XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']