Bug 841634 - Assign ContentParent::mChildID to a unique value in the constructor, instead of in RecvGetProcessAttributes. r=cjones

This commit is contained in:
Justin Lebar 2013-02-15 08:40:35 -05:00
parent 57da7526a6
commit 7453dbec82

View File

@ -1071,7 +1071,7 @@ ContentParent::ContentParent(const nsAString& aAppManifestURL,
ProcessPriority aInitialPriority /* = PROCESS_PRIORITY_FOREGROUND */) ProcessPriority aInitialPriority /* = PROCESS_PRIORITY_FOREGROUND */)
: mSubprocess(nullptr) : mSubprocess(nullptr)
, mOSPrivileges(aOSPrivileges) , mOSPrivileges(aOSPrivileges)
, mChildID(CONTENT_PROCESS_ID_UNKNOWN) , mChildID(gContentChildID++)
, mGeolocationWatchID(-1) , mGeolocationWatchID(-1)
, mRunToCompletionDepth(0) , mRunToCompletionDepth(0)
, mShouldCallUnblockChild(false) , mShouldCallUnblockChild(false)
@ -1583,7 +1583,7 @@ bool
ContentParent::RecvGetProcessAttributes(uint64_t* aId, ContentParent::RecvGetProcessAttributes(uint64_t* aId,
bool* aIsForApp, bool* aIsForBrowser) bool* aIsForApp, bool* aIsForBrowser)
{ {
*aId = mChildID = gContentChildID++; *aId = mChildID;
*aIsForApp = IsForApp(); *aIsForApp = IsForApp();
*aIsForBrowser = mIsForBrowser; *aIsForBrowser = mIsForBrowser;