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

Side by Side Diff: sky/engine/bindings/core/v8/ScriptWrappable.cpp

Issue 722723003: Re-land 714393002 after fixing android build. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « sky/engine/bindings/core/v8/ScriptWrappable.h ('k') | sky/engine/config.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/ScriptWrappable.h" 6 #include "bindings/core/v8/ScriptWrappable.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)
14 __declspec(align(4))
15 #endif
16 struct SameSizeAsScriptWrappableBase { }; 13 struct SameSizeAsScriptWrappableBase { };
17 14
18 COMPILE_ASSERT(sizeof(ScriptWrappableBase) <= sizeof(SameSizeAsScriptWrappableBa se), ScriptWrappableBase_should_stay_small); 15 COMPILE_ASSERT(sizeof(ScriptWrappableBase) <= sizeof(SameSizeAsScriptWrappableBa se), ScriptWrappableBase_should_stay_small);
19 16
20 struct SameSizeAsScriptWrappable : public ScriptWrappableBase { 17 struct SameSizeAsScriptWrappable : public ScriptWrappableBase {
21 virtual ~SameSizeAsScriptWrappable() { } 18 virtual ~SameSizeAsScriptWrappable() { }
22 uintptr_t m_wrapperOrTypeInfo; 19 uintptr_t m_wrapperOrTypeInfo;
23 }; 20 };
24 21
25 COMPILE_ASSERT(sizeof(ScriptWrappable) <= sizeof(SameSizeAsScriptWrappable), Scr iptWrappable_should_stay_small); 22 COMPILE_ASSERT(sizeof(ScriptWrappable) <= sizeof(SameSizeAsScriptWrappable), Scr iptWrappable_should_stay_small);
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 wrapperTypeInfo->installConditionallyEnabledProperties(wrapper, isolate); 61 wrapperTypeInfo->installConditionallyEnabledProperties(wrapper, isolate);
65 return associateWithWrapper(wrapperTypeInfo, wrapper, isolate); 62 return associateWithWrapper(wrapperTypeInfo, wrapper, isolate);
66 } 63 }
67 64
68 v8::Handle<v8::Object> ScriptWrappable::associateWithWrapper(const WrapperTypeIn fo* wrapperTypeInfo, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate) 65 v8::Handle<v8::Object> ScriptWrappable::associateWithWrapper(const WrapperTypeIn fo* wrapperTypeInfo, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate)
69 { 66 {
70 return V8DOMWrapper::associateObjectWithWrapperNonTemplate(this, wrapperType Info, wrapper, isolate); 67 return V8DOMWrapper::associateObjectWithWrapperNonTemplate(this, wrapperType Info, wrapper, isolate);
71 } 68 }
72 69
73 } // namespace blink 70 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/bindings/core/v8/ScriptWrappable.h ('k') | sky/engine/config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698