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

Side by Side Diff: Source/bindings/core/v8/custom/V8InjectedScriptManager.cpp

Issue 651713002: Oilpan: DOM wrappers don't need to keep persistent handles (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 { 65 {
66 ASSERT(host); 66 ASSERT(host);
67 67
68 v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext , &V8InjectedScriptHost::wrapperTypeInfo, host->toScriptWrappableBase(), isolate ); 68 v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext , &V8InjectedScriptHost::wrapperTypeInfo, host->toScriptWrappableBase(), isolate );
69 if (UNLIKELY(wrapper.IsEmpty())) 69 if (UNLIKELY(wrapper.IsEmpty()))
70 return wrapper; 70 return wrapper;
71 71
72 // Create a weak reference to the v8 wrapper of InspectorBackend to deref 72 // Create a weak reference to the v8 wrapper of InspectorBackend to deref
73 // InspectorBackend when the wrapper is garbage collected. 73 // InspectorBackend when the wrapper is garbage collected.
74 InjectedScriptManager::CallbackData* callbackData = injectedScriptManager->c reateCallbackData(injectedScriptManager); 74 InjectedScriptManager::CallbackData* callbackData = injectedScriptManager->c reateCallbackData(injectedScriptManager);
75 #if ENABLE(OILPAN)
76 callbackData->hostPtr = WrapperPersistent<InjectedScriptHost>::create(host.g et());
77 #else
78 callbackData->host = host.get(); 75 callbackData->host = host.get();
79 #endif
80 callbackData->handle.set(isolate, wrapper); 76 callbackData->handle.set(isolate, wrapper);
81 callbackData->handle.setWeak(callbackData, &InjectedScriptManager::setWeakCa llback); 77 callbackData->handle.setWeak(callbackData, &InjectedScriptManager::setWeakCa llback);
82 78
83 #if ENABLE(OILPAN)
84 V8DOMWrapper::setNativeInfoWithPersistentHandle(wrapper, &V8InjectedScriptHo st::wrapperTypeInfo, host->toScriptWrappableBase(), callbackData->hostPtr);
85 #else
86 V8DOMWrapper::setNativeInfo(wrapper, &V8InjectedScriptHost::wrapperTypeInfo, host->toScriptWrappableBase()); 79 V8DOMWrapper::setNativeInfo(wrapper, &V8InjectedScriptHost::wrapperTypeInfo, host->toScriptWrappableBase());
87 #endif
88 ASSERT(V8DOMWrapper::isDOMWrapper(wrapper)); 80 ASSERT(V8DOMWrapper::isDOMWrapper(wrapper));
89 return wrapper; 81 return wrapper;
90 } 82 }
91 83
92 ScriptValue InjectedScriptManager::createInjectedScript(const String& scriptSour ce, ScriptState* inspectedScriptState, int id) 84 ScriptValue InjectedScriptManager::createInjectedScript(const String& scriptSour ce, ScriptState* inspectedScriptState, int id)
93 { 85 {
94 v8::Isolate* isolate = inspectedScriptState->isolate(); 86 v8::Isolate* isolate = inspectedScriptState->isolate();
95 ScriptState::Scope scope(inspectedScriptState); 87 ScriptState::Scope scope(inspectedScriptState);
96 88
97 // Call custom code to create InjectedScripHost wrapper specific for the con text 89 // Call custom code to create InjectedScripHost wrapper specific for the con text
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 return BindingSecurity::shouldAllowAccessToFrame(scriptState->isolate(), fra me, DoNotReportSecurityError); 123 return BindingSecurity::shouldAllowAccessToFrame(scriptState->isolate(), fra me, DoNotReportSecurityError);
132 } 124 }
133 125
134 void InjectedScriptManager::setWeakCallback(const v8::WeakCallbackData<v8::Objec t, InjectedScriptManager::CallbackData>& data) 126 void InjectedScriptManager::setWeakCallback(const v8::WeakCallbackData<v8::Objec t, InjectedScriptManager::CallbackData>& data)
135 { 127 {
136 InjectedScriptManager::CallbackData* callbackData = data.GetParameter(); 128 InjectedScriptManager::CallbackData* callbackData = data.GetParameter();
137 callbackData->injectedScriptManager->removeCallbackData(callbackData); 129 callbackData->injectedScriptManager->removeCallbackData(callbackData);
138 } 130 }
139 131
140 } // namespace blink 132 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/core/v8/custom/V8ArrayBufferCustom.cpp ('k') | Source/bindings/core/v8/custom/V8TypedArrayCustom.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698