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

Side by Side Diff: content/renderer/pepper/plugin_object.h

Issue 780713002: Fix remaining WeakPtrFactory ordering problems (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 6 years 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 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_PEPPER_PLUGIN_OBJECT_H_ 5 #ifndef CONTENT_RENDERER_PEPPER_PLUGIN_OBJECT_H_
6 #define CONTENT_RENDERER_PEPPER_PLUGIN_OBJECT_H_ 6 #define CONTENT_RENDERER_PEPPER_PLUGIN_OBJECT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 void Call(const std::string& identifier, gin::Arguments* args); 77 void Call(const std::string& identifier, gin::Arguments* args);
78 78
79 v8::Local<v8::FunctionTemplate> GetFunctionTemplate(v8::Isolate* isolate, 79 v8::Local<v8::FunctionTemplate> GetFunctionTemplate(v8::Isolate* isolate,
80 const std::string& name); 80 const std::string& name);
81 81
82 PepperPluginInstanceImpl* instance_; 82 PepperPluginInstanceImpl* instance_;
83 83
84 const PPP_Class_Deprecated* ppp_class_; 84 const PPP_Class_Deprecated* ppp_class_;
85 void* ppp_class_data_; 85 void* ppp_class_data_;
86 86
87 v8::StdPersistentValueMap<std::string, v8::FunctionTemplate> template_cache_;
88
87 base::WeakPtrFactory<PluginObject> weak_factory_; 89 base::WeakPtrFactory<PluginObject> weak_factory_;
88 90
89 v8::StdPersistentValueMap<std::string, v8::FunctionTemplate> template_cache_;
90
91 DISALLOW_COPY_AND_ASSIGN(PluginObject); 91 DISALLOW_COPY_AND_ASSIGN(PluginObject);
92 }; 92 };
93 93
94 } // namespace content 94 } // namespace content
95 95
96 #endif // CONTENT_RENDERER_PEPPER_PLUGIN_OBJECT_H_ 96 #endif // CONTENT_RENDERER_PEPPER_PLUGIN_OBJECT_H_
OLDNEW
« no previous file with comments | « content/renderer/media/remote_media_stream_impl.cc ('k') | content/renderer/pepper/plugin_object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698