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

Side by Side Diff: webkit/plugins/ppapi/ppapi_webplugin_impl.h

Issue 9403039: PPAPI: Really force-free NPObjects on Instance destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 WEBKIT_PLUGINS_PPAPI_PPAPI_WEBPLUGIN_IMPL_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_WEBPLUGIN_IMPL_H_
6 #define WEBKIT_PLUGINS_PPAPI_PPAPI_WEBPLUGIN_IMPL_H_ 6 #define WEBKIT_PLUGINS_PPAPI_PPAPI_WEBPLUGIN_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "base/message_loop_helpers.h" 13 #include "base/message_loop_helpers.h"
14 #include "ppapi/c/pp_var.h"
14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" 15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h"
15 #include "ui/gfx/rect.h" 16 #include "ui/gfx/rect.h"
16 #include "webkit/plugins/webkit_plugins_export.h" 17 #include "webkit/plugins/webkit_plugins_export.h"
17 18
18 namespace WebKit { 19 namespace WebKit {
19 struct WebPluginParams; 20 struct WebPluginParams;
20 } 21 }
21 22
22 namespace webkit { 23 namespace webkit {
23 namespace ppapi { 24 namespace ppapi {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 87
87 struct InitData; 88 struct InitData;
88 89
89 scoped_ptr<InitData> init_data_; // Cleared upon successful initialization. 90 scoped_ptr<InitData> init_data_; // Cleared upon successful initialization.
90 // True if the instance represents the entire document in a frame instead of 91 // True if the instance represents the entire document in a frame instead of
91 // being an embedded resource. 92 // being an embedded resource.
92 bool full_frame_; 93 bool full_frame_;
93 scoped_refptr<PluginInstance> instance_; 94 scoped_refptr<PluginInstance> instance_;
94 scoped_refptr<PPB_URLLoader_Impl> document_loader_; 95 scoped_refptr<PPB_URLLoader_Impl> document_loader_;
95 gfx::Rect plugin_rect_; 96 gfx::Rect plugin_rect_;
97 PP_Var instance_object_;
96 98
97 DISALLOW_COPY_AND_ASSIGN(WebPluginImpl); 99 DISALLOW_COPY_AND_ASSIGN(WebPluginImpl);
98 }; 100 };
99 101
100 } // namespace ppapi 102 } // namespace ppapi
101 } // namespace webkit 103 } // namespace webkit
102 104
103 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_WEBPLUGIN_IMPL_H_ 105 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_WEBPLUGIN_IMPL_H_
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/ppapi_plugin_instance.cc ('k') | webkit/plugins/ppapi/ppapi_webplugin_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698