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

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

Issue 717703002: Move the v8::Isolate* parameter to the first parameter of various binding methods in third_party/We… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.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 | « Source/bindings/core/v8/ScriptDebugServer.cpp ('k') | Source/bindings/core/v8/V8DOMWrapper.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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 v8::Handle<v8::Object> ScriptWrappableBase::wrap(v8::Handle<v8::Object> creation Context, v8::Isolate* isolate, const WrapperTypeInfo* wrapperTypeInfo) 51 v8::Handle<v8::Object> ScriptWrappableBase::wrap(v8::Handle<v8::Object> creation Context, v8::Isolate* isolate, const WrapperTypeInfo* wrapperTypeInfo)
52 { 52 {
53 // It's possible that no one except for the new wrapper owns this object at 53 // It's possible that no one except for the new wrapper owns this object at
54 // this moment, so we have to prevent GC to collect this object until the 54 // this moment, so we have to prevent GC to collect this object until the
55 // object gets associated with the wrapper. 55 // object gets associated with the wrapper.
56 ScriptWrappableBaseProtector protect(this, wrapperTypeInfo); 56 ScriptWrappableBaseProtector protect(this, wrapperTypeInfo);
57 57
58 ASSERT(!DOMDataStore::containsWrapper(this, isolate)); 58 ASSERT(!DOMDataStore::containsWrapper(this, isolate));
59 59
60 v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext , wrapperTypeInfo, this, isolate); 60 v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creati onContext, wrapperTypeInfo, this);
61 if (UNLIKELY(wrapper.IsEmpty())) 61 if (UNLIKELY(wrapper.IsEmpty()))
62 return wrapper; 62 return wrapper;
63 63
64 wrapperTypeInfo->installConditionallyEnabledProperties(wrapper, isolate); 64 wrapperTypeInfo->installConditionallyEnabledProperties(wrapper, isolate);
65 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn fo, wrapper); 65 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn fo, wrapper);
66 } 66 }
67 67
68 // ScriptWrappable 68 // ScriptWrappable
69 69
70 v8::Handle<v8::Object> ScriptWrappable::wrap(v8::Handle<v8::Object> creationCont ext, v8::Isolate* isolate) 70 v8::Handle<v8::Object> ScriptWrappable::wrap(v8::Handle<v8::Object> creationCont ext, v8::Isolate* isolate)
71 { 71 {
72 const WrapperTypeInfo* wrapperTypeInfo = this->wrapperTypeInfo(); 72 const WrapperTypeInfo* wrapperTypeInfo = this->wrapperTypeInfo();
73 73
74 // It's possible that no one except for the new wrapper owns this object at 74 // It's possible that no one except for the new wrapper owns this object at
75 // this moment, so we have to prevent GC to collect this object until the 75 // this moment, so we have to prevent GC to collect this object until the
76 // object gets associated with the wrapper. 76 // object gets associated with the wrapper.
77 ScriptWrappableBaseProtector protect(this, wrapperTypeInfo); 77 ScriptWrappableBaseProtector protect(this, wrapperTypeInfo);
78 78
79 ASSERT(!DOMDataStore::containsWrapper(this, isolate)); 79 ASSERT(!DOMDataStore::containsWrapper(this, isolate));
80 80
81 v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext , wrapperTypeInfo, toScriptWrappableBase(), isolate); 81 v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creati onContext, wrapperTypeInfo, toScriptWrappableBase());
82 if (UNLIKELY(wrapper.IsEmpty())) 82 if (UNLIKELY(wrapper.IsEmpty()))
83 return wrapper; 83 return wrapper;
84 84
85 wrapperTypeInfo->installConditionallyEnabledProperties(wrapper, isolate); 85 wrapperTypeInfo->installConditionallyEnabledProperties(wrapper, isolate);
86 return associateWithWrapper(wrapperTypeInfo, wrapper, isolate); 86 return associateWithWrapper(wrapperTypeInfo, wrapper, isolate);
87 } 87 }
88 88
89 v8::Handle<v8::Object> ScriptWrappable::associateWithWrapper(const WrapperTypeIn fo* wrapperTypeInfo, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate) 89 v8::Handle<v8::Object> ScriptWrappable::associateWithWrapper(const WrapperTypeIn fo* wrapperTypeInfo, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate)
90 { 90 {
91 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn fo, wrapper); 91 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn fo, wrapper);
92 } 92 }
93 93
94 } // namespace blink 94 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/core/v8/ScriptDebugServer.cpp ('k') | Source/bindings/core/v8/V8DOMWrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698