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

Side by Side Diff: third_party/WebKit/Source/core/inspector/InjectedScriptHost.h

Issue 1377813002: Oilpan: fix build after r351269. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use a WeakPersistent<InjectedScriptManager> instead Created 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple Inc. All rights reserved.
3 * Copyright (C) 2009 Google Inc. All rights reserved. 3 * Copyright (C) 2009 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 InjectedScriptHostClient* client() { return m_client.get(); } 102 InjectedScriptHostClient* client() { return m_client.get(); }
103 103
104 // FIXME: store this template in per isolate data 104 // FIXME: store this template in per isolate data
105 void setWrapperTemplate(v8::Local<v8::FunctionTemplate> wrapperTemplate, v8: :Isolate* isolate) { m_wrapperTemplate.Reset(isolate, wrapperTemplate); } 105 void setWrapperTemplate(v8::Local<v8::FunctionTemplate> wrapperTemplate, v8: :Isolate* isolate) { m_wrapperTemplate.Reset(isolate, wrapperTemplate); }
106 v8::Local<v8::FunctionTemplate> wrapperTemplate(v8::Isolate* isolate) { retu rn v8::Local<v8::FunctionTemplate>::New(isolate, m_wrapperTemplate); } 106 v8::Local<v8::FunctionTemplate> wrapperTemplate(v8::Isolate* isolate) { retu rn v8::Local<v8::FunctionTemplate>::New(isolate, m_wrapperTemplate); }
107 107
108 private: 108 private:
109 InjectedScriptHost(); 109 InjectedScriptHost();
110 110
111 RawPtrWillBeMember<InspectorConsoleAgent> m_consoleAgent; 111 RawPtrWillBeMember<InspectorConsoleAgent> m_consoleAgent;
112 RawPtrWillBeMember<V8DebuggerAgent> m_debuggerAgent; 112 V8DebuggerAgent* m_debuggerAgent;
113 OwnPtr<InspectCallback> m_inspectCallback; 113 OwnPtr<InspectCallback> m_inspectCallback;
114 V8Debugger* m_debugger; 114 V8Debugger* m_debugger;
115 WillBeHeapVector<OwnPtrWillBeMember<InspectableObject>> m_inspectedObjects; 115 WillBeHeapVector<OwnPtrWillBeMember<InspectableObject>> m_inspectedObjects;
116 OwnPtrWillBeMember<InspectableObject> m_defaultInspectableObject; 116 OwnPtrWillBeMember<InspectableObject> m_defaultInspectableObject;
117 OwnPtr<InjectedScriptHostClient> m_client; 117 OwnPtr<InjectedScriptHostClient> m_client;
118 v8::Global<v8::FunctionTemplate> m_wrapperTemplate; 118 v8::Global<v8::FunctionTemplate> m_wrapperTemplate;
119 }; 119 };
120 120
121 } // namespace blink 121 } // namespace blink
122 122
123 #endif // InjectedScriptHost_h 123 #endif // InjectedScriptHost_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698