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

Side by Side Diff: Source/bindings/v8/V8DOMWrapper.cpp

Issue 289283020: Oilpan: avoid leak on creating shadow document wrapper. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 } 57 }
58 58
59 v8::Local<v8::Function> shadowConstructor = shadowTemplate->GetFunction(); 59 v8::Local<v8::Function> shadowConstructor = shadowTemplate->GetFunction();
60 if (shadowConstructor.IsEmpty()) 60 if (shadowConstructor.IsEmpty())
61 return v8::Local<v8::Object>(); 61 return v8::Local<v8::Object>();
62 62
63 v8::Local<v8::Object> shadow = V8ScriptRunner::instantiateObject(isolate, sh adowConstructor); 63 v8::Local<v8::Object> shadow = V8ScriptRunner::instantiateObject(isolate, sh adowConstructor);
64 if (shadow.IsEmpty()) 64 if (shadow.IsEmpty())
65 return v8::Local<v8::Object>(); 65 return v8::Local<v8::Object>();
66 shadow->SetPrototype(wrapper); 66 shadow->SetPrototype(wrapper);
67 V8DOMWrapper::setNativeInfo(wrapper, &V8HTMLDocument::wrapperTypeInfo, impl) ; 67 V8DOMWrapper::setNativeInfoForHiddenWrapper(wrapper, &V8HTMLDocument::wrappe rTypeInfo, impl);
68 return shadow; 68 return shadow;
69 } 69 }
70 70
71 v8::Local<v8::Object> V8DOMWrapper::createWrapper(v8::Handle<v8::Object> creatio nContext, const WrapperTypeInfo* type, void* impl, v8::Isolate* isolate) 71 v8::Local<v8::Object> V8DOMWrapper::createWrapper(v8::Handle<v8::Object> creatio nContext, const WrapperTypeInfo* type, void* impl, v8::Isolate* isolate)
72 { 72 {
73 V8WrapperInstantiationScope scope(creationContext, isolate); 73 V8WrapperInstantiationScope scope(creationContext, isolate);
74 74
75 V8PerContextData* perContextData = V8PerContextData::from(scope.context()); 75 V8PerContextData* perContextData = V8PerContextData::from(scope.context());
76 v8::Local<v8::Object> wrapper = perContextData ? perContextData->createWrapp erFromCache(type) : V8ObjectConstructor::newInstance(isolate, type->domTemplate( isolate)->GetFunction()); 76 v8::Local<v8::Object> wrapper = perContextData ? perContextData->createWrapp erFromCache(type) : V8ObjectConstructor::newInstance(isolate, type->domTemplate( isolate)->GetFunction());
77 77
(...skipping 15 matching lines...) Expand all
93 ASSERT(wrapper->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)) ; 93 ASSERT(wrapper->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)) ;
94 ASSERT(wrapper->GetAlignedPointerFromInternalField(v8DOMWrapperTypeIndex)); 94 ASSERT(wrapper->GetAlignedPointerFromInternalField(v8DOMWrapperTypeIndex));
95 95
96 const WrapperTypeInfo* typeInfo = static_cast<const WrapperTypeInfo*>(wrappe r->GetAlignedPointerFromInternalField(v8DOMWrapperTypeIndex)); 96 const WrapperTypeInfo* typeInfo = static_cast<const WrapperTypeInfo*>(wrappe r->GetAlignedPointerFromInternalField(v8DOMWrapperTypeIndex));
97 // FIXME: We should add a more strict way to check if the typeInfo is a type Info of some DOM wrapper. 97 // FIXME: We should add a more strict way to check if the typeInfo is a type Info of some DOM wrapper.
98 // Even if it's a typeInfo of Blink, it's not guaranteed that it's a typeInf o of a DOM wrapper. 98 // Even if it's a typeInfo of Blink, it's not guaranteed that it's a typeInf o of a DOM wrapper.
99 return typeInfo->ginEmbedder == gin::kEmbedderBlink; 99 return typeInfo->ginEmbedder == gin::kEmbedderBlink;
100 } 100 }
101 101
102 } // namespace WebCore 102 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698