mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: use webContentsId with contextId together (#13749)

Browse source 
After after using `processId-contextCounter` as contextId, it may happen
that contexts in different WebContents sharing the same renderer process
get the same contextId. Using webContentsId as part of key in
ObjectsRegistry can fix this.
This commit is contained in:
Cheng Zhao 2018-07-24 16:21:38 +09:00 • committed by GitHub
parent d7b41462af
commit 3094f62f0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

19
atom/common/context_counter.cc
View file

@ -1,19 +0,0 @@
// Copyright (c) 2018 GitHub, Inc.
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "atom/common/context_counter.h"
namespace atom {
namespace {
int g_context_id = 0;
} // namespace
int GetNextContextId() {
return ++g_context_id;
}
} // namespace atom

15
atom/common/context_counter.h
View file

@ -1,15 +0,0 @@
// Copyright (c) 2018 GitHub, Inc.
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#ifndef ATOM_COMMON_CONTEXT_COUNTER_H_
#define ATOM_COMMON_CONTEXT_COUNTER_H_
namespace atom {
// Increase the context counter, and return current count.
int GetNextContextId();
} // namespace atom
#endif // ATOM_COMMON_CONTEXT_COUNTER_H_