Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Unified Diff: third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.h

Issue 2628053003: Remove extension group from DOMWrapperWorld. (Closed)
Patch Set: Fix GCCallbackTest Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.h
diff --git a/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.h b/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.h
index fce2a838e49270b789ca40adbb084040f8f095d1..bb3fd0bcd3b6fa48abfa56a46fb7cfc8bc09a746 100644
--- a/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.h
+++ b/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.h
@@ -59,14 +59,10 @@ class DOMObjectHolderBase;
// This class represent a collection of DOM wrappers for a specific world.
class CORE_EXPORT DOMWrapperWorld : public RefCounted<DOMWrapperWorld> {
public:
- static PassRefPtr<DOMWrapperWorld> create(v8::Isolate*,
- int worldId = -1,
- int extensionGroup = -1);
+ static PassRefPtr<DOMWrapperWorld> create(v8::Isolate*, int worldId = -1);
- static const int mainWorldExtensionGroup = 0;
static PassRefPtr<DOMWrapperWorld> ensureIsolatedWorld(v8::Isolate*,
- int worldId,
- int extensionGroup);
+ int worldId);
~DOMWrapperWorld();
void dispose();
@@ -88,9 +84,7 @@ class CORE_EXPORT DOMWrapperWorld : public RefCounted<DOMWrapperWorld> {
}
static DOMWrapperWorld& mainWorld();
- static PassRefPtr<DOMWrapperWorld> fromWorldId(v8::Isolate*,
- int worldId,
- int extensionGroup);
+ static PassRefPtr<DOMWrapperWorld> fromWorldId(v8::Isolate*, int worldId);
static void setIsolatedWorldHumanReadableName(int worldID, const String&);
String isolatedWorldHumanReadableName();
@@ -121,7 +115,6 @@ class CORE_EXPORT DOMWrapperWorld : public RefCounted<DOMWrapperWorld> {
}
int worldId() const { return m_worldId; }
- int extensionGroup() const { return m_extensionGroup; }
DOMDataStore& domDataStore() const { return *m_domDataStore; }
public:
@@ -129,7 +122,7 @@ class CORE_EXPORT DOMWrapperWorld : public RefCounted<DOMWrapperWorld> {
void registerDOMObjectHolder(v8::Isolate*, T*, v8::Local<v8::Value>);
private:
- DOMWrapperWorld(v8::Isolate*, int worldId, int extensionGroup);
+ DOMWrapperWorld(v8::Isolate*, int worldId);
static void weakCallbackForDOMObjectHolder(
const v8::WeakCallbackInfo<DOMObjectHolderBase>&);
@@ -139,7 +132,6 @@ class CORE_EXPORT DOMWrapperWorld : public RefCounted<DOMWrapperWorld> {
static unsigned isolatedWorldCount;
const int m_worldId;
- const int m_extensionGroup;
std::unique_ptr<DOMDataStore> m_domDataStore;
HashSet<std::unique_ptr<DOMObjectHolderBase>> m_domObjectHolders;
};
« no previous file with comments | « extensions/renderer/test_extensions_renderer_client.cc ('k') | third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698