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

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

Issue 170893003: Revert 167276 "Remove isolatedWorldForEnteredContext() and isola..." (Closed) Base URL: svn://svn.chromium.org/blink/
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 DOMWrapperWorld* world = DOMWrapperWorld::current(isolate); 128 if (!isolatedWorldForEnteredContext(isolate)) {
129 if (world->isMainWorld()) {
130 if (Frame* frame = impl->frame()) 129 if (Frame* frame = impl->frame())
131 frame->script().windowShell(world)->updateDocumentWrapper(wrapper); 130 frame->script().windowShell(DOMWrapperWorld::mainWorld())->updateDoc umentWrapper(wrapper);
132 } 131 }
133 return wrapper; 132 return wrapper;
134 } 133 }
135 134
136 v8::Handle<v8::Object> V8TestInterfaceDocument::createWrapper(PassRefPtr<TestInt erfaceDocument> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isola te) 135 v8::Handle<v8::Object> V8TestInterfaceDocument::createWrapper(PassRefPtr<TestInt erfaceDocument> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isola te)
137 { 136 {
138 ASSERT(impl); 137 ASSERT(impl);
139 ASSERT(!DOMDataStore::containsWrapper<V8TestInterfaceDocument>(impl.get(), i solate)); 138 ASSERT(!DOMDataStore::containsWrapper<V8TestInterfaceDocument>(impl.get(), i solate));
140 if (ScriptWrappable::wrapperCanBeStoredInObject(impl.get())) { 139 if (ScriptWrappable::wrapperCanBeStoredInObject(impl.get())) {
141 const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObje ct(impl.get()); 140 const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObje ct(impl.get());
(...skipping 24 matching lines...) Expand all
166 fromInternalPointer(object)->deref(); 165 fromInternalPointer(object)->deref();
167 } 166 }
168 167
169 template<> 168 template<>
170 v8::Handle<v8::Value> toV8NoInline(TestInterfaceDocument* impl, v8::Handle<v8::O bject> creationContext, v8::Isolate* isolate) 169 v8::Handle<v8::Value> toV8NoInline(TestInterfaceDocument* impl, v8::Handle<v8::O bject> creationContext, v8::Isolate* isolate)
171 { 170 {
172 return toV8(impl, creationContext, isolate); 171 return toV8(impl, creationContext, isolate);
173 } 172 }
174 173
175 } // namespace WebCore 174 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698