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

Unified Diff: third_party/WebKit/Source/bindings/core/v8/DOMDataStore.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/DOMDataStore.h
diff --git a/third_party/WebKit/Source/bindings/core/v8/DOMDataStore.h b/third_party/WebKit/Source/bindings/core/v8/DOMDataStore.h
index a1a32f125f72deb6dcd3d098f53f11469c7c0b75..6a94545883ea6450570d220ecef76b26ba4dd4b6 100644
--- a/third_party/WebKit/Source/bindings/core/v8/DOMDataStore.h
+++ b/third_party/WebKit/Source/bindings/core/v8/DOMDataStore.h
@@ -28,172 +28,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef DOMDataStore_h
-#define DOMDataStore_h
-
-#include <memory>
-
-#include "bindings/core/v8/DOMWrapperMap.h"
-#include "bindings/core/v8/DOMWrapperWorld.h"
-#include "bindings/core/v8/ScriptWrappable.h"
-#include "bindings/core/v8/WrapperTypeInfo.h"
-#include "platform/wtf/Allocator.h"
-#include "platform/wtf/Noncopyable.h"
-#include "platform/wtf/Optional.h"
-#include "platform/wtf/StackUtil.h"
-#include "platform/wtf/StdLibExtras.h"
-#include "v8/include/v8.h"
-
-namespace blink {
-
-class DOMDataStore {
- WTF_MAKE_NONCOPYABLE(DOMDataStore);
- USING_FAST_MALLOC(DOMDataStore);
-
- public:
- DOMDataStore(v8::Isolate* isolate, bool is_main_world)
- : is_main_world_(is_main_world) {
- // We never use |m_wrapperMap| when it's the main world.
- if (!is_main_world)
- wrapper_map_.emplace(isolate);
- }
-
- static DOMDataStore& Current(v8::Isolate* isolate) {
- return DOMWrapperWorld::Current(isolate).DomDataStore();
- }
-
- static bool SetReturnValue(v8::ReturnValue<v8::Value> return_value,
- ScriptWrappable* object) {
- if (CanUseMainWorldWrapper())
- return object->SetReturnValue(return_value);
- return Current(return_value.GetIsolate())
- .SetReturnValueFrom(return_value, object);
- }
-
- static bool SetReturnValueForMainWorld(
- v8::ReturnValue<v8::Value> return_value,
- ScriptWrappable* object) {
- return object->SetReturnValue(return_value);
- }
-
- static bool SetReturnValueFast(v8::ReturnValue<v8::Value> return_value,
- ScriptWrappable* object,
- v8::Local<v8::Object> holder,
- const ScriptWrappable* wrappable) {
- if (CanUseMainWorldWrapper()
- // The second fastest way to check if we're in the main world is to
- // check if the wrappable's wrapper is the same as the holder.
- || HolderContainsWrapper(holder, wrappable))
- return object->SetReturnValue(return_value);
- return Current(return_value.GetIsolate())
- .SetReturnValueFrom(return_value, object);
- }
-
- static v8::Local<v8::Object> GetWrapper(ScriptWrappable* object,
- v8::Isolate* isolate) {
- if (CanUseMainWorldWrapper())
- return object->MainWorldWrapper(isolate);
- return Current(isolate).Get(object, isolate);
- }
-
- // Associates the given |object| with the given |wrapper| if the object is
- // not yet associated with any wrapper. Returns true if the given wrapper
- // is associated with the object, or false if the object is already
- // associated with a wrapper. In the latter case, |wrapper| will be updated
- // to the existing wrapper.
- WARN_UNUSED_RESULT static bool SetWrapper(
- v8::Isolate* isolate,
- ScriptWrappable* object,
- const WrapperTypeInfo* wrapper_type_info,
- v8::Local<v8::Object>& wrapper) {
- if (CanUseMainWorldWrapper())
- return object->SetWrapper(isolate, wrapper_type_info, wrapper);
- return Current(isolate).Set(isolate, object, wrapper_type_info, wrapper);
- }
-
- static bool ContainsWrapper(ScriptWrappable* object, v8::Isolate* isolate) {
- return Current(isolate).ContainsWrapper(object);
- }
-
- v8::Local<v8::Object> Get(ScriptWrappable* object, v8::Isolate* isolate) {
- if (is_main_world_)
- return object->MainWorldWrapper(isolate);
- return wrapper_map_->NewLocal(isolate, object);
- }
-
- WARN_UNUSED_RESULT bool Set(v8::Isolate* isolate,
- ScriptWrappable* object,
- const WrapperTypeInfo* wrapper_type_info,
- v8::Local<v8::Object>& wrapper) {
- DCHECK(object);
- DCHECK(!wrapper.IsEmpty());
- if (is_main_world_)
- return object->SetWrapper(isolate, wrapper_type_info, wrapper);
- return wrapper_map_->Set(object, wrapper_type_info, wrapper);
- }
-
- void MarkWrapper(ScriptWrappable* script_wrappable) {
- wrapper_map_->MarkWrapper(script_wrappable);
- }
-
- // Dissociates a wrapper, if any, from |script_wrappable|.
- void UnsetWrapperIfAny(ScriptWrappable* script_wrappable) {
- DCHECK(!is_main_world_);
- wrapper_map_->RemoveIfAny(script_wrappable);
- }
-
- bool SetReturnValueFrom(v8::ReturnValue<v8::Value> return_value,
- ScriptWrappable* object) {
- if (is_main_world_)
- return object->SetReturnValue(return_value);
- return wrapper_map_->SetReturnValueFrom(return_value, object);
- }
-
- bool ContainsWrapper(ScriptWrappable* object) {
- if (is_main_world_)
- return object->ContainsWrapper();
- return wrapper_map_->ContainsKey(object);
- }
-
- private:
- // We can use a wrapper stored in a ScriptWrappable when we're in the main
- // world. This method does the fast check if we're in the main world. If this
- // method returns true, it is guaranteed that we're in the main world. On the
- // other hand, if this method returns false, nothing is guaranteed (we might
- // be in the main world).
- static bool CanUseMainWorldWrapper() {
- return !WTF::MayNotBeMainThread() &&
- !DOMWrapperWorld::NonMainWorldsExistInMainThread();
- }
-
- static bool HolderContainsWrapper(v8::Local<v8::Object> holder,
- const ScriptWrappable* wrappable) {
- // Verify our assumptions about the main world.
- DCHECK(wrappable);
- DCHECK(!wrappable->ContainsWrapper() || !wrappable->IsEqualTo(holder) ||
- Current(v8::Isolate::GetCurrent()).is_main_world_);
- return wrappable->IsEqualTo(holder);
- }
-
- bool is_main_world_;
- WTF::Optional<DOMWrapperMap<ScriptWrappable>> wrapper_map_;
-};
-
-template <>
-inline void DOMWrapperMap<ScriptWrappable>::PersistentValueMapTraits::Dispose(
- v8::Isolate*,
- v8::Global<v8::Object>,
- ScriptWrappable*) {
- WrapperTypeInfo::WrapperDestroyed();
-}
-
-template <>
-inline void
-DOMWrapperMap<ScriptWrappable>::PersistentValueMapTraits::DisposeWeak(
- const v8::WeakCallbackInfo<WeakCallbackDataType>&) {
- WrapperTypeInfo::WrapperDestroyed();
-}
-
-} // namespace blink
-
-#endif // DOMDataStore_h
+// This file has been moved to platform/bindings/DOMDataStore.h.
+// TODO(adithyas): Remove this file.
+#include "platform/bindings/DOMDataStore.h"

Powered by Google App Engine
This is Rietveld 408576698