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

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

Issue 39393004: IDL compiler: rename WrapperTypeInfo info => wrapperTypeInfo (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 v8::Local<v8::Function> function = V8InjectedScriptHost::GetTemplate(isolate , MainWorld)->GetFunction(); 50 v8::Local<v8::Function> function = V8InjectedScriptHost::GetTemplate(isolate , MainWorld)->GetFunction();
51 if (function.IsEmpty()) { 51 if (function.IsEmpty()) {
52 // Return if allocation failed. 52 // Return if allocation failed.
53 return v8::Local<v8::Object>(); 53 return v8::Local<v8::Object>();
54 } 54 }
55 v8::Local<v8::Object> instance = V8ObjectConstructor::newInstance(function); 55 v8::Local<v8::Object> instance = V8ObjectConstructor::newInstance(function);
56 if (instance.IsEmpty()) { 56 if (instance.IsEmpty()) {
57 // Avoid setting the wrapper if allocation failed. 57 // Avoid setting the wrapper if allocation failed.
58 return v8::Local<v8::Object>(); 58 return v8::Local<v8::Object>();
59 } 59 }
60 V8DOMWrapper::setNativeInfo(instance, &V8InjectedScriptHost::info, host); 60 V8DOMWrapper::setNativeInfo(instance, &V8InjectedScriptHost::wrapperTypeInfo , host);
61 // Create a weak reference to the v8 wrapper of InspectorBackend to deref 61 // Create a weak reference to the v8 wrapper of InspectorBackend to deref
62 // InspectorBackend when the wrapper is garbage collected. 62 // InspectorBackend when the wrapper is garbage collected.
63 host->ref(); 63 host->ref();
64 v8::Persistent<v8::Object> weakHandle(isolate, instance); 64 v8::Persistent<v8::Object> weakHandle(isolate, instance);
65 weakHandle.MakeWeak(host, &InjectedScriptManager::makeWeakCallback); 65 weakHandle.MakeWeak(host, &InjectedScriptManager::makeWeakCallback);
66 return instance; 66 return instance;
67 } 67 }
68 68
69 ScriptObject InjectedScriptManager::createInjectedScript(const String& scriptSou rce, ScriptState* inspectedScriptState, int id) 69 ScriptObject InjectedScriptManager::createInjectedScript(const String& scriptSou rce, ScriptState* inspectedScriptState, int id)
70 { 70 {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 return BindingSecurity::shouldAllowAccessToFrame(frame, DoNotReportSecurityE rror); 115 return BindingSecurity::shouldAllowAccessToFrame(frame, DoNotReportSecurityE rror);
116 } 116 }
117 117
118 void InjectedScriptManager::makeWeakCallback(v8::Isolate* isolate, v8::Persisten t<v8::Object>* object, InjectedScriptHost* host) 118 void InjectedScriptManager::makeWeakCallback(v8::Isolate* isolate, v8::Persisten t<v8::Object>* object, InjectedScriptHost* host)
119 { 119 {
120 host->deref(); 120 host->deref();
121 object->Dispose(); 121 object->Dispose();
122 } 122 }
123 123
124 } // namespace WebCore 124 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698