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

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

Issue 1126013003: v8::Isolate* should be the first parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Wrap function Change for v8::Isolate* , as it is no more optional argument Created 5 years, 7 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
« no previous file with comments | « Source/bindings/core/v8/ScriptWrappable.h ('k') | Source/bindings/core/v8/ToV8.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
(...skipping 21 matching lines...) Expand all
32 m_wrapperTypeInfo->derefObject(m_scriptWrappable); 32 m_wrapperTypeInfo->derefObject(m_scriptWrappable);
33 } 33 }
34 34
35 private: 35 private:
36 ScriptWrappable* m_scriptWrappable; 36 ScriptWrappable* m_scriptWrappable;
37 const WrapperTypeInfo* m_wrapperTypeInfo; 37 const WrapperTypeInfo* m_wrapperTypeInfo;
38 }; 38 };
39 39
40 } // namespace 40 } // namespace
41 41
42 v8::Local<v8::Object> ScriptWrappable::wrap(v8::Local<v8::Object> creationContex t, v8::Isolate* isolate) 42 v8::Local<v8::Object> ScriptWrappable::wrap(v8::Isolate* isolate, v8::Local<v8:: Object> creationContext)
43 { 43 {
44 const WrapperTypeInfo* wrapperTypeInfo = this->wrapperTypeInfo(); 44 const WrapperTypeInfo* wrapperTypeInfo = this->wrapperTypeInfo();
45 45
46 // It's possible that no one except for the new wrapper owns this object at 46 // It's possible that no one except for the new wrapper owns this object at
47 // this moment, so we have to prevent GC to collect this object until the 47 // this moment, so we have to prevent GC to collect this object until the
48 // object gets associated with the wrapper. 48 // object gets associated with the wrapper.
49 ScriptWrappableProtector protect(this, wrapperTypeInfo); 49 ScriptWrappableProtector protect(this, wrapperTypeInfo);
50 50
51 ASSERT(!DOMDataStore::containsWrapper(this, isolate)); 51 ASSERT(!DOMDataStore::containsWrapper(this, isolate));
52 52
53 v8::Local<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creatio nContext, wrapperTypeInfo, this); 53 v8::Local<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creatio nContext, wrapperTypeInfo, this);
54 if (UNLIKELY(wrapper.IsEmpty())) 54 if (UNLIKELY(wrapper.IsEmpty()))
55 return wrapper; 55 return wrapper;
56 56
57 wrapperTypeInfo->installConditionallyEnabledProperties(wrapper, isolate); 57 wrapperTypeInfo->installConditionallyEnabledProperties(wrapper, isolate);
58 return associateWithWrapper(isolate, wrapperTypeInfo, wrapper); 58 return associateWithWrapper(isolate, wrapperTypeInfo, wrapper);
59 } 59 }
60 60
61 v8::Local<v8::Object> ScriptWrappable::associateWithWrapper(v8::Isolate* isolate , const WrapperTypeInfo* wrapperTypeInfo, v8::Local<v8::Object> wrapper) 61 v8::Local<v8::Object> ScriptWrappable::associateWithWrapper(v8::Isolate* isolate , const WrapperTypeInfo* wrapperTypeInfo, v8::Local<v8::Object> wrapper)
62 { 62 {
63 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn fo, wrapper); 63 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn fo, wrapper);
64 } 64 }
65 65
66 } // namespace blink 66 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/core/v8/ScriptWrappable.h ('k') | Source/bindings/core/v8/ToV8.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698