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

Side by Side Diff: ppapi/proxy/plugin_dispatcher.h

Issue 8371008: Revert 106717 - Revert 106677 (caused several PPAPI test timeouts, see http://crbug.com/101154) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 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 | « ppapi/proxy/interface_proxy.cc ('k') | ppapi/proxy/plugin_dispatcher.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) 2011 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 PPAPI_PROXY_PLUGIN_DISPATCHER_H_ 5 #ifndef PPAPI_PROXY_PLUGIN_DISPATCHER_H_
6 #define PPAPI_PROXY_PLUGIN_DISPATCHER_H_ 6 #define PPAPI_PROXY_PLUGIN_DISPATCHER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 16 matching lines...) Expand all
27 namespace ppapi { 27 namespace ppapi {
28 28
29 struct Preferences; 29 struct Preferences;
30 class Resource; 30 class Resource;
31 31
32 namespace proxy { 32 namespace proxy {
33 33
34 // Used to keep track of per-instance data. 34 // Used to keep track of per-instance data.
35 struct InstanceData { 35 struct InstanceData {
36 InstanceData(); 36 InstanceData();
37 ~InstanceData();
38
37 PP_Rect position; 39 PP_Rect position;
38 PP_Bool fullscreen; // Used for PPB_Fullscreen. 40 PP_Bool fullscreen; // Used for PPB_Fullscreen.
39 PP_Bool flash_fullscreen; // Used for PPB_FlashFullscreen. 41 PP_Bool flash_fullscreen; // Used for PPB_FlashFullscreen.
42
43 // When non-0, indicates the callback to execute when mouse lock is lost.
44 PP_CompletionCallback mouse_lock_callback;
40 }; 45 };
41 46
42 class PPAPI_PROXY_EXPORT PluginDispatcher : public Dispatcher { 47 class PPAPI_PROXY_EXPORT PluginDispatcher : public Dispatcher {
43 public: 48 public:
44 class PPAPI_PROXY_EXPORT PluginDelegate : public ProxyChannel::Delegate { 49 class PPAPI_PROXY_EXPORT PluginDelegate : public ProxyChannel::Delegate {
45 public: 50 public:
46 // Returns the set used for globally uniquifying PP_Instances. This same 51 // Returns the set used for globally uniquifying PP_Instances. This same
47 // set must be returned for all channels. 52 // set must be returned for all channels.
48 // 53 //
49 // DEREFERENCE ONLY ON THE I/O THREAD. 54 // DEREFERENCE ONLY ON THE I/O THREAD.
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 175
171 uint32 plugin_dispatcher_id_; 176 uint32 plugin_dispatcher_id_;
172 177
173 DISALLOW_COPY_AND_ASSIGN(PluginDispatcher); 178 DISALLOW_COPY_AND_ASSIGN(PluginDispatcher);
174 }; 179 };
175 180
176 } // namespace proxy 181 } // namespace proxy
177 } // namespace ppapi 182 } // namespace ppapi
178 183
179 #endif // PPAPI_PROXY_PLUGIN_DISPATCHER_H_ 184 #endif // PPAPI_PROXY_PLUGIN_DISPATCHER_H_
OLDNEW
« no previous file with comments | « ppapi/proxy/interface_proxy.cc ('k') | ppapi/proxy/plugin_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698