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

Side by Side Diff: content/plugin/webplugin_delegate_stub.h

Issue 9959078: Revert 128179 - Make sure the plugin scriptable object is released before NPP_Destroy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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
« no previous file with comments | « content/common/npobject_stub.h ('k') | content/plugin/webplugin_delegate_stub.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_ 5 #ifndef CONTENT_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_
6 #define CONTENT_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_ 6 #define CONTENT_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "content/common/npobject_stub.h"
14 #include "googleurl/src/gurl.h" 13 #include "googleurl/src/gurl.h"
15 #include "ipc/ipc_channel.h" 14 #include "ipc/ipc_channel.h"
16 #include "third_party/npapi/bindings/npapi.h" 15 #include "third_party/npapi/bindings/npapi.h"
17 #include "ui/gfx/native_widget_types.h" 16 #include "ui/gfx/native_widget_types.h"
18 #include "ui/gfx/rect.h" 17 #include "ui/gfx/rect.h"
19 18
20 class PluginChannel; 19 class PluginChannel;
21 class WebPluginProxy; 20 class WebPluginProxy;
22 struct PluginMsg_Init_Params; 21 struct PluginMsg_Init_Params;
23 struct PluginMsg_DidReceiveResponseParams; 22 struct PluginMsg_DidReceiveResponseParams;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 void OnHandleURLRequestReply(unsigned long resource_id, 106 void OnHandleURLRequestReply(unsigned long resource_id,
108 const GURL& url, 107 const GURL& url,
109 int notify_id); 108 int notify_id);
110 void OnHTTPRangeRequestReply(unsigned long resource_id, int range_request_id); 109 void OnHTTPRangeRequestReply(unsigned long resource_id, int range_request_id);
111 110
112 std::string mime_type_; 111 std::string mime_type_;
113 int instance_id_; 112 int instance_id_;
114 113
115 scoped_refptr<PluginChannel> channel_; 114 scoped_refptr<PluginChannel> channel_;
116 115
117 base::WeakPtr<NPObjectStub> plugin_scriptable_object_;
118 webkit::npapi::WebPluginDelegateImpl* delegate_; 116 webkit::npapi::WebPluginDelegateImpl* delegate_;
119 WebPluginProxy* webplugin_; 117 WebPluginProxy* webplugin_;
120 bool in_destructor_; 118 bool in_destructor_;
121 119
122 // The url of the main frame hosting the plugin. 120 // The url of the main frame hosting the plugin.
123 GURL page_url_; 121 GURL page_url_;
124 122
125 #if defined(ENABLE_GPU) 123 #if defined(ENABLE_GPU)
126 #if defined(OS_MACOSX) 124 #if defined(OS_MACOSX)
127 // If this is a GPU-accelerated plug-in, we need to be able to receive a fake 125 // If this is a GPU-accelerated plug-in, we need to be able to receive a fake
128 // window handle which is used for subsequent communication back to the 126 // window handle which is used for subsequent communication back to the
129 // browser. 127 // browser.
130 void OnSetFakeAcceleratedSurfaceWindowHandle(gfx::PluginWindowHandle window); 128 void OnSetFakeAcceleratedSurfaceWindowHandle(gfx::PluginWindowHandle window);
131 #endif 129 #endif
132 #endif 130 #endif
133 131
134 DISALLOW_IMPLICIT_CONSTRUCTORS(WebPluginDelegateStub); 132 DISALLOW_IMPLICIT_CONSTRUCTORS(WebPluginDelegateStub);
135 }; 133 };
136 134
137 #endif // CONTENT_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_ 135 #endif // CONTENT_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_
OLDNEW
« no previous file with comments | « content/common/npobject_stub.h ('k') | content/plugin/webplugin_delegate_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698