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

Side by Side Diff: webkit/glue/webplugin_impl.h

Issue 174383: Fixes a crash caused due to a call to NPP_DestroyStream occuring in the conte... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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 | « webkit/glue/plugins/test/plugin_test.cc ('k') | webkit/glue/webplugin_impl.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_GLUE_WEBPLUGIN_IMPL_H_ 5 #ifndef WEBKIT_GLUE_WEBPLUGIN_IMPL_H_
6 #define WEBKIT_GLUE_WEBPLUGIN_IMPL_H_ 6 #define WEBKIT_GLUE_WEBPLUGIN_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 // Delayed task for downloading the plugin source URL. 231 // Delayed task for downloading the plugin source URL.
232 void OnDownloadPluginSrcUrl(); 232 void OnDownloadPluginSrcUrl();
233 233
234 // Returns the WebViewDelegate associated with webframe_; 234 // Returns the WebViewDelegate associated with webframe_;
235 WebViewDelegate* GetWebViewDelegate(); 235 WebViewDelegate* GetWebViewDelegate();
236 236
237 struct ClientInfo { 237 struct ClientInfo {
238 int id; 238 int id;
239 WebPluginResourceClient* client; 239 WebPluginResourceClient* client;
240 WebKit::WebURLRequest request; 240 WebKit::WebURLRequest request;
241 bool pending_failure_notification;
241 linked_ptr<WebKit::WebURLLoader> loader; 242 linked_ptr<WebKit::WebURLLoader> loader;
242 }; 243 };
243 244
244 // Helper functions 245 // Helper functions
245 WebPluginResourceClient* GetClientFromLoader(WebKit::WebURLLoader* loader); 246 WebPluginResourceClient* GetClientFromLoader(WebKit::WebURLLoader* loader);
246 ClientInfo* GetClientInfoFromLoader(WebKit::WebURLLoader* loader); 247 ClientInfo* GetClientInfoFromLoader(WebKit::WebURLLoader* loader);
247 248
248 std::vector<ClientInfo> clients_; 249 std::vector<ClientInfo> clients_;
249 250
250 bool windowless_; 251 bool windowless_;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 288
288 // Holds the list of argument values passed to the plugin. 289 // Holds the list of argument values passed to the plugin.
289 std::vector<std::string> arg_values_; 290 std::vector<std::string> arg_values_;
290 291
291 ScopedRunnableMethodFactory<WebPluginImpl> method_factory_; 292 ScopedRunnableMethodFactory<WebPluginImpl> method_factory_;
292 293
293 DISALLOW_COPY_AND_ASSIGN(WebPluginImpl); 294 DISALLOW_COPY_AND_ASSIGN(WebPluginImpl);
294 }; 295 };
295 296
296 #endif // #ifndef WEBKIT_GLUE_WEBPLUGIN_IMPL_H_ 297 #endif // #ifndef WEBKIT_GLUE_WEBPLUGIN_IMPL_H_
OLDNEW
« no previous file with comments | « webkit/glue/plugins/test/plugin_test.cc ('k') | webkit/glue/webplugin_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698