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

Side by Side Diff: chrome/plugin/webplugin_proxy.h

Issue 165381: Merge 22369 - Fix plugin IPC issues.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 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 | « chrome/plugin/webplugin_delegate_stub.cc ('k') | chrome/plugin/webplugin_proxy.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Modified: svn:mergeinfo
Merged /trunk/src/chrome/plugin/webplugin_proxy.h:r22369
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 CHROME_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__ 5 #ifndef CHROME_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__
6 #define CHROME_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__ 6 #define CHROME_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/hash_tables.h" 10 #include "base/hash_tables.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 const TransportDIB::Handle& background_buffer); 114 const TransportDIB::Handle& background_buffer);
115 115
116 void CancelDocumentLoad(); 116 void CancelDocumentLoad();
117 117
118 void InitiateHTTPRangeRequest(const char* url, 118 void InitiateHTTPRangeRequest(const char* url,
119 const char* range_info, 119 const char* range_info,
120 intptr_t existing_stream, 120 intptr_t existing_stream,
121 bool notify_needed, 121 bool notify_needed,
122 intptr_t notify_data); 122 intptr_t notify_data);
123 123
124 void SetDeferResourceLoading(int resource_id, bool defer);
125
124 bool IsOffTheRecord(); 126 bool IsOffTheRecord();
125 127
126 void ResourceClientDeleted(WebPluginResourceClient* resource_client); 128 void ResourceClientDeleted(WebPluginResourceClient* resource_client);
127 129
128 base::WaitableEvent* modal_dialog_event() { 130 base::WaitableEvent* modal_dialog_event() {
129 return modal_dialog_event_.get(); 131 return modal_dialog_event_.get();
130 } 132 }
131 133
132 private: 134 private:
133 bool Send(IPC::Message* msg); 135 bool Send(IPC::Message* msg);
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 scoped_ptr<TransportDIB> windowless_dib_; 186 scoped_ptr<TransportDIB> windowless_dib_;
185 scoped_ptr<TransportDIB> background_dib_; 187 scoped_ptr<TransportDIB> background_dib_;
186 scoped_cftyperef<CGContextRef> windowless_context_; 188 scoped_cftyperef<CGContextRef> windowless_context_;
187 scoped_cftyperef<CGContextRef> background_context_; 189 scoped_cftyperef<CGContextRef> background_context_;
188 #endif 190 #endif
189 191
190 ScopedRunnableMethodFactory<WebPluginProxy> runnable_method_factory_; 192 ScopedRunnableMethodFactory<WebPluginProxy> runnable_method_factory_;
191 }; 193 };
192 194
193 #endif // CHROME_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__ 195 #endif // CHROME_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__
OLDNEW
« no previous file with comments | « chrome/plugin/webplugin_delegate_stub.cc ('k') | chrome/plugin/webplugin_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698