Add a DevTools command to create an isolated world for a given frame

third_party/WebKit/Source/platform/bindings/DOMWrapperWorld.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 41 matching lines @@
 class PLATFORM_EXPORT DOMWrapperWorld : public RefCounted<DOMWrapperWorld> {
  public:
   // Per-thread global identifiers for DOMWrapperWorld.
   enum WorldId {
     kInvalidWorldId = -1,
     kMainWorldId = 0,
 
     // Embedder isolated worlds can use IDs in [1, 1<<29).
     kEmbedderWorldIdLimit = (1 << 29),
     kDocumentXMLTreeViewerWorldId,
+    kDevToolsFirstIsolatedWorldId,
+    kDevToolsLastIsolatedWorldId = kDevToolsFirstIsolatedWorldId + 100,
     kIsolatedWorldIdLimit,
 
     // Other worlds can use IDs after this. Don't manually pick up an ID from
     // this range. generateWorldIdForType() picks it up on behalf of you.
     kUnspecifiedWorldIdStart,
   };
 
   enum class WorldType {
     kMain,
     kIsolated,
+    kInspectorIsolated,
     kGarbageCollector,
     kRegExp,
     kTesting,
     kWorker,
   };
 
-  // Creates a world other than IsolatedWorld.
+  // Creates a world other than IsolatedWorld. Note this can return nullptr if
+  // GenerateWorldIdForType fails to allocate a valid id.
   static PassRefPtr<DOMWrapperWorld> Create(v8::Isolate*, WorldType);
 
   // Ensures an IsolatedWorld for |worldId|.
   static PassRefPtr<DOMWrapperWorld> EnsureIsolatedWorld(v8::Isolate*,
                                                          int world_id);
   ~DOMWrapperWorld();
   void Dispose();
 
   // Called from performance-sensitive functions, so we should keep this simple
   // and fast as much as possible.
@@ skipping 32 matching lines @@
   //
   // FIXME: Right now, resource injection simply bypasses the main world's
   // DOM. More work is necessary to allow the isolated world's policy to be
   // applied correctly.
   static void SetIsolatedWorldContentSecurityPolicy(int world_id,
                                                     const String& policy);
   bool IsolatedWorldHasContentSecurityPolicy();
 
   bool IsMainWorld() const { return world_type_ == WorldType::kMain; }
   bool IsWorkerWorld() const { return world_type_ == WorldType::kWorker; }
-  bool IsIsolatedWorld() const { return world_type_ == WorldType::kIsolated; }
+  bool IsIsolatedWorld() const {
+    return world_type_ == WorldType::kIsolated ||
+           world_type_ == WorldType::kInspectorIsolated;
+  }
 
   int GetWorldId() const { return world_id_; }
   DOMDataStore& DomDataStore() const { return *dom_data_store_; }
 
   template <typename T>
   void RegisterDOMObjectHolder(v8::Isolate* isolate,
                                T* object,
                                v8::Local<v8::Value> wrapper) {
     RegisterDOMObjectHolderInternal(
         DOMObjectHolder<T>::Create(isolate, object, wrapper));
@@ skipping 43 matching lines @@
   void RegisterDOMObjectHolderInternal(std::unique_ptr<DOMObjectHolderBase>);
   void UnregisterDOMObjectHolder(DOMObjectHolderBase*);
 
   static unsigned number_of_non_main_worlds_in_main_thread_;
 
   // Returns an identifier for a given world type. This must not be called for
   // WorldType::IsolatedWorld because an identifier for the world is given from
   // out of DOMWrapperWorld.
   static int GenerateWorldIdForType(WorldType);
 
+  // Returns an id in the range
+  // [kDevToolsFirstIsolatedWorldId, kDevToolsLastIsolatedWorldId] or
+  // kInvalidWorldId if that range has been exhausted.
+  static int GetNextInspectorIsolatedWorldId();

[pfeldman, 2017/05/09 18:57:36]

do you still need it?

[alex clarke (OOO till 29th), 2017/05/09 19:40:36]

It's gone.

+
   // Dissociates all wrappers in all worlds associated with |script_wrappable|.
   //
   // Do not use this function except for DOMWindow.  Only DOMWindow needs to
   // dissociate wrappers from the ScriptWrappable because of the following two
   // reasons.
   //
   // Reason 1) Case of the main world
   // A DOMWindow may be collected by Blink GC *before* V8 GC collects the
   // wrapper because the wrapper object associated with a DOMWindow is a global
   // proxy, which remains after navigations.  We don't want V8 GC to reset the
@@ skipping 13 matching lines @@
 
   const WorldType world_type_;
   const int world_id_;
   std::unique_ptr<DOMDataStore> dom_data_store_;
   HashSet<std::unique_ptr<DOMObjectHolderBase>> dom_object_holders_;
 };
 
 }  // namespace blink
 
 #endif  // DOMWrapperWorld_h