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

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/ScriptWrappable.cpp

Issue 2209593002: Stop returning an empty handle from createWrapper() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: temp Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "bindings/core/v8/ScriptWrappable.h" 5 #include "bindings/core/v8/ScriptWrappable.h"
6 6
7 #include "bindings/core/v8/DOMDataStore.h" 7 #include "bindings/core/v8/DOMDataStore.h"
8 #include "bindings/core/v8/ScriptWrappableVisitor.h" 8 #include "bindings/core/v8/ScriptWrappableVisitor.h"
9 #include "bindings/core/v8/V8DOMWrapper.h" 9 #include "bindings/core/v8/V8DOMWrapper.h"
10 10
11 namespace blink { 11 namespace blink {
12 12
13 struct SameSizeAsScriptWrappable { 13 struct SameSizeAsScriptWrappable {
14 virtual ~SameSizeAsScriptWrappable() { } 14 virtual ~SameSizeAsScriptWrappable() { }
15 v8::Persistent<v8::Object> m_mainWorldWrapper; 15 v8::Persistent<v8::Object> m_mainWorldWrapper;
16 }; 16 };
17 17
18 static_assert(sizeof(ScriptWrappable) <= sizeof(SameSizeAsScriptWrappable), "Scr iptWrappable should stay small"); 18 static_assert(sizeof(ScriptWrappable) <= sizeof(SameSizeAsScriptWrappable), "Scr iptWrappable should stay small");
19 19
20 v8::Local<v8::Object> ScriptWrappable::wrap(v8::Isolate* isolate, v8::Local<v8:: Object> creationContext) 20 v8::Local<v8::Object> ScriptWrappable::wrap(v8::Isolate* isolate, v8::Local<v8:: Object> creationContext)
21 { 21 {
22 const WrapperTypeInfo* wrapperTypeInfo = this->wrapperTypeInfo(); 22 const WrapperTypeInfo* wrapperTypeInfo = this->wrapperTypeInfo();
23 23
24 ASSERT(!DOMDataStore::containsWrapper(this, isolate)); 24 ASSERT(!DOMDataStore::containsWrapper(this, isolate));
25 25
26 v8::Local<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creatio nContext, wrapperTypeInfo); 26 v8::Local<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creatio nContext, wrapperTypeInfo);
27 if (UNLIKELY(wrapper.IsEmpty())) 27 DCHECK(!wrapper.IsEmpty());
28 return wrapper;
29
30 wrapperTypeInfo->installConditionallyEnabledProperties(wrapper, isolate); 28 wrapperTypeInfo->installConditionallyEnabledProperties(wrapper, isolate);
31 return associateWithWrapper(isolate, wrapperTypeInfo, wrapper); 29 return associateWithWrapper(isolate, wrapperTypeInfo, wrapper);
32 } 30 }
33 31
34 v8::Local<v8::Object> ScriptWrappable::associateWithWrapper(v8::Isolate* isolate , const WrapperTypeInfo* wrapperTypeInfo, v8::Local<v8::Object> wrapper) 32 v8::Local<v8::Object> ScriptWrappable::associateWithWrapper(v8::Isolate* isolate , const WrapperTypeInfo* wrapperTypeInfo, v8::Local<v8::Object> wrapper)
35 { 33 {
36 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn fo, wrapper); 34 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn fo, wrapper);
37 } 35 }
38 36
39 void ScriptWrappable::markWrapper(const WrapperVisitor* visitor) const 37 void ScriptWrappable::markWrapper(const WrapperVisitor* visitor) const
40 { 38 {
41 if (containsWrapper()) 39 if (containsWrapper())
42 visitor->markWrapper(&m_mainWorldWrapper); 40 visitor->markWrapper(&m_mainWorldWrapper);
43 } 41 }
44 42
45 } // namespace blink 43 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698