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

Side by Side Diff: Source/bindings/tests/results/V8TestInterfaceDocument.cpp

Issue 137953010: Remove isolatedWorldForEnteredContext() and isolatedWorldForIsolate() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 { 118 {
119 return toNative(object); 119 return toNative(object);
120 } 120 }
121 121
122 v8::Handle<v8::Object> wrap(TestInterfaceDocument* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate) 122 v8::Handle<v8::Object> wrap(TestInterfaceDocument* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
123 { 123 {
124 ASSERT(impl); 124 ASSERT(impl);
125 v8::Handle<v8::Object> wrapper = V8TestInterfaceDocument::createWrapper(impl , creationContext, isolate); 125 v8::Handle<v8::Object> wrapper = V8TestInterfaceDocument::createWrapper(impl , creationContext, isolate);
126 if (wrapper.IsEmpty()) 126 if (wrapper.IsEmpty())
127 return wrapper; 127 return wrapper;
128 if (!isolatedWorldForEnteredContext(isolate)) { 128 DOMWrapperWorld* world = DOMWrapperWorld::current(isolate);
129 if (world->isMainWorld()) {
129 if (Frame* frame = impl->frame()) 130 if (Frame* frame = impl->frame())
130 frame->script().windowShell(DOMWrapperWorld::mainWorld())->updateDoc umentWrapper(wrapper); 131 frame->script().windowShell(world)->updateDocumentWrapper(wrapper);
131 } 132 }
132 return wrapper; 133 return wrapper;
133 } 134 }
134 135
135 v8::Handle<v8::Object> V8TestInterfaceDocument::createWrapper(PassRefPtr<TestInt erfaceDocument> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isola te) 136 v8::Handle<v8::Object> V8TestInterfaceDocument::createWrapper(PassRefPtr<TestInt erfaceDocument> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isola te)
136 { 137 {
137 ASSERT(impl); 138 ASSERT(impl);
138 ASSERT(!DOMDataStore::containsWrapper<V8TestInterfaceDocument>(impl.get(), i solate)); 139 ASSERT(!DOMDataStore::containsWrapper<V8TestInterfaceDocument>(impl.get(), i solate));
139 if (ScriptWrappable::wrapperCanBeStoredInObject(impl.get())) { 140 if (ScriptWrappable::wrapperCanBeStoredInObject(impl.get())) {
140 const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObje ct(impl.get()); 141 const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObje ct(impl.get());
(...skipping 24 matching lines...) Expand all
165 fromInternalPointer(object)->deref(); 166 fromInternalPointer(object)->deref();
166 } 167 }
167 168
168 template<> 169 template<>
169 v8::Handle<v8::Value> toV8NoInline(TestInterfaceDocument* impl, v8::Handle<v8::O bject> creationContext, v8::Isolate* isolate) 170 v8::Handle<v8::Value> toV8NoInline(TestInterfaceDocument* impl, v8::Handle<v8::O bject> creationContext, v8::Isolate* isolate)
170 { 171 {
171 return toV8(impl, creationContext, isolate); 172 return toV8(impl, creationContext, isolate);
172 } 173 }
173 174
174 } // namespace WebCore 175 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/scripts/code_generator_v8.pm ('k') | Source/bindings/tests/results/V8TestInterfaceEventConstructor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698