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

Side by Side Diff: Source/bindings/core/v8/V8ScriptWrappable.cpp

Issue 611833004: [multivm] Re-split fields for V8 and Dart wrappers. (Closed) Base URL: svn://svn.chromium.org/blink/branches/dart/multivm
Patch Set: Created 6 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « Source/bindings/core/v8/V8ScriptWrappable.h ('k') | Source/bindings/dart/DartScriptWrappable.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "config.h" 5 #include "config.h"
6 #include "bindings/core/v8/V8ScriptWrappable.h" 6 #include "bindings/core/v8/V8ScriptWrappable.h"
7 7
8 #include "bindings/core/v8/DOMDataStore.h" 8 #include "bindings/core/v8/DOMDataStore.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 #if COMPILER(MSVC) 13 #if COMPILER(MSVC)
14 __declspec(align(4)) 14 __declspec(align(4))
15 #endif 15 #endif
16 struct SameSizeAsScriptWrappableBase { }; 16 struct SameSizeAsScriptWrappableBase { };
17 17
18 COMPILE_ASSERT(sizeof(ScriptWrappableBase) <= sizeof(SameSizeAsScriptWrappableBa se), ScriptWrappableBase_should_stay_small); 18 COMPILE_ASSERT(sizeof(ScriptWrappableBase) <= sizeof(SameSizeAsScriptWrappableBa se), ScriptWrappableBase_should_stay_small);
19 19
20 struct SameSizeAsScriptWrappable : public ScriptWrappableBase { 20 struct SameSizeAsScriptWrappable : public ScriptWrappableBase {
21 virtual ~SameSizeAsScriptWrappable() { } 21 virtual ~SameSizeAsScriptWrappable() { }
22 uintptr_t m_wrapper; 22 uintptr_t m_v8Wrapper;
23 uintptr_t m_dartWrapperInfo;
23 }; 24 };
24 25
25 COMPILE_ASSERT(sizeof(ScriptWrappable) <= sizeof(SameSizeAsScriptWrappable), Scr iptWrappable_should_stay_small); 26 COMPILE_ASSERT(sizeof(ScriptWrappable) <= sizeof(SameSizeAsScriptWrappable), Scr iptWrappable_should_stay_small);
26 27
27 v8::Handle<v8::Object> ScriptWrappable::wrap(v8::Handle<v8::Object> creationCont ext, v8::Isolate* isolate) 28 v8::Handle<v8::Object> ScriptWrappable::wrap(v8::Handle<v8::Object> creationCont ext, v8::Isolate* isolate)
28 { 29 {
29 ASSERT(!DOMDataStore::containsWrapperNonTemplate(this, isolate)); 30 ASSERT(!DOMDataStore::containsWrapperNonTemplate(this, isolate));
30 31
31 const WrapperTypeInfo* wrapperType = wrapperTypeInfo(); 32 const WrapperTypeInfo* wrapperType = wrapperTypeInfo();
32 33
33 v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext , wrapperType, toScriptWrappableBase(), isolate); 34 v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext , wrapperType, toScriptWrappableBase(), isolate);
34 if (UNLIKELY(wrapper.IsEmpty())) 35 if (UNLIKELY(wrapper.IsEmpty()))
35 return wrapper; 36 return wrapper;
36 37
37 wrapperType->installConditionallyEnabledProperties(wrapper, isolate); 38 wrapperType->installConditionallyEnabledProperties(wrapper, isolate);
38 return associateWithWrapper(wrapperType, wrapper, isolate); 39 return associateWithWrapper(wrapperType, wrapper, isolate);
39 } 40 }
40 41
41 v8::Handle<v8::Object> ScriptWrappable::associateWithWrapper(const WrapperTypeIn fo* wrapperType, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate) 42 v8::Handle<v8::Object> ScriptWrappable::associateWithWrapper(const WrapperTypeIn fo* wrapperType, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate)
42 { 43 {
43 wrapperType->refObject(toScriptWrappableBase()); 44 wrapperType->refObject(toScriptWrappableBase());
44 V8DOMWrapper::associateObjectWithWrapperNonTemplate(this, wrapperType, wrapp er, isolate); 45 V8DOMWrapper::associateObjectWithWrapperNonTemplate(this, wrapperType, wrapp er, isolate);
45 return wrapper; 46 return wrapper;
46 } 47 }
47 48
48 } // namespace blink 49 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/core/v8/V8ScriptWrappable.h ('k') | Source/bindings/dart/DartScriptWrappable.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698