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

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

Issue 2843603002: Move ScriptWrappable and dependencies to platform/bindings (Closed)
Patch Set: Rebase and try again Created 3 years, 8 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 c4f2cd852b050ca976a74f7b59045572de065dc7..779774a34d8a3e434ed502bf351fb0635c66e6a9 100644
--- a/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.h
+++ b/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.h
@@ -28,200 +28,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef DOMWrapperWorld_h
-#define DOMWrapperWorld_h
-
-#include <memory>
-
-#include "bindings/core/v8/ScriptState.h"
-#include "core/CoreExport.h"
-#include "platform/weborigin/SecurityOrigin.h"
-#include "platform/wtf/PassRefPtr.h"
-#include "platform/wtf/RefCounted.h"
-#include "platform/wtf/RefPtr.h"
-#include "v8/include/v8.h"
-
-namespace blink {
-
-class DOMDataStore;
-class DOMObjectHolderBase;
-
-// This class represent a collection of DOM wrappers for a specific world. This
-// is identified by a world id that is a per-thread global identifier (see
-// WorldId enum).
-class CORE_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,
- 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,
- kGarbageCollector,
- kRegExp,
- kTesting,
- kWorker,
- };
-
- // Creates a world other than IsolatedWorld.
- 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.
- static bool NonMainWorldsExistInMainThread() {
- return number_of_non_main_worlds_in_main_thread_;
- }
-
- static void AllWorldsInCurrentThread(Vector<RefPtr<DOMWrapperWorld>>& worlds);
- static void MarkWrappersInAllWorlds(ScriptWrappable*,
- const ScriptWrappableVisitor*);
-
- static DOMWrapperWorld& World(v8::Local<v8::Context> context) {
- return ScriptState::From(context)->World();
- }
-
- static DOMWrapperWorld& Current(v8::Isolate* isolate) {
- return World(isolate->GetCurrentContext());
- }
-
- static DOMWrapperWorld& MainWorld();
-
- static void SetIsolatedWorldHumanReadableName(int world_id, const String&);
- String IsolatedWorldHumanReadableName();
-
- // Associates an isolated world (see above for description) with a security
- // origin. XMLHttpRequest instances used in that world will be considered
- // to come from that origin, not the frame's.
- static void SetIsolatedWorldSecurityOrigin(int world_id,
- PassRefPtr<SecurityOrigin>);
- SecurityOrigin* IsolatedWorldSecurityOrigin();
-
- // Associated an isolated world with a Content Security Policy. Resources
- // embedded into the main world's DOM from script executed in an isolated
- // world should be restricted based on the isolated world's DOM, not the
- // main world's.
- //
- // 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; }
-
- 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));
- }
-
- private:
- class DOMObjectHolderBase {
- USING_FAST_MALLOC(DOMObjectHolderBase);
-
- public:
- DOMObjectHolderBase(v8::Isolate* isolate, v8::Local<v8::Value> wrapper)
- : wrapper_(isolate, wrapper), world_(nullptr) {}
- virtual ~DOMObjectHolderBase() {}
-
- DOMWrapperWorld* World() const { return world_; }
- void SetWorld(DOMWrapperWorld* world) { world_ = world; }
- void SetWeak(v8::WeakCallbackInfo<DOMObjectHolderBase>::Callback callback) {
- wrapper_.SetWeak(this, callback);
- }
-
- private:
- ScopedPersistent<v8::Value> wrapper_;
- DOMWrapperWorld* world_;
- };
-
- template <typename T>
- class DOMObjectHolder : public DOMObjectHolderBase {
- public:
- static std::unique_ptr<DOMObjectHolder<T>>
- Create(v8::Isolate* isolate, T* object, v8::Local<v8::Value> wrapper) {
- return WTF::WrapUnique(new DOMObjectHolder(isolate, object, wrapper));
- }
-
- private:
- DOMObjectHolder(v8::Isolate* isolate,
- T* object,
- v8::Local<v8::Value> wrapper)
- : DOMObjectHolderBase(isolate, wrapper), object_(object) {}
-
- Persistent<T> object_;
- };
-
- DOMWrapperWorld(v8::Isolate*, WorldType, int world_id);
-
- static void WeakCallbackForDOMObjectHolder(
- const v8::WeakCallbackInfo<DOMObjectHolderBase>&);
- 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);
-
- // 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
- // weak persistent handle to a wrapper within the DOMWindow
- // (ScriptWrappable::main_world_wrapper_) *after* Blink GC collects the
- // DOMWindow because it's use-after-free. Thus, we need to dissociate the
- // wrapper in advance.
- //
- // Reason 2) Case of isolated worlds
- // As same, a DOMWindow may be collected before the wrapper gets collected.
- // A DOMWrapperMap supports mapping from ScriptWrappable* to v8::Global<T>,
- // and we don't want to leave an entry of an already-dead DOMWindow* to the
- // persistent handle for the global proxy object, especially considering that
- // the address to the already-dead DOMWindow* may be re-used.
- friend class DOMWindow;
- static void DissociateDOMWindowWrappersInAllWorlds(ScriptWrappable*);
-
- 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
+// This file has been moved to platform/bindings/DOMWrapperWorld.h.
+// TODO(adithyas): Remove this file.
+#include "platform/bindings/DOMWrapperWorld.h"

Powered by Google App Engine
This is Rietveld 408576698