OLD | NEW |
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 #include "ppapi/proxy/plugin_dispatcher.h" | 5 #include "ppapi/proxy/plugin_dispatcher.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 namespace ppapi { | 36 namespace ppapi { |
37 namespace proxy { | 37 namespace proxy { |
38 | 38 |
39 namespace { | 39 namespace { |
40 | 40 |
41 typedef std::map<PP_Instance, PluginDispatcher*> InstanceToDispatcherMap; | 41 typedef std::map<PP_Instance, PluginDispatcher*> InstanceToDispatcherMap; |
42 InstanceToDispatcherMap* g_instance_to_dispatcher = NULL; | 42 InstanceToDispatcherMap* g_instance_to_dispatcher = NULL; |
43 | 43 |
44 } // namespace | 44 } // namespace |
45 | 45 |
46 InstanceData::InstanceData() : fullscreen(PP_FALSE) { | 46 InstanceData::InstanceData() |
| 47 : fullscreen(PP_FALSE), flash_fullscreen(PP_FALSE) { |
47 memset(&position, 0, sizeof(position)); | 48 memset(&position, 0, sizeof(position)); |
48 } | 49 } |
49 | 50 |
50 PluginDispatcher::PluginDispatcher(base::ProcessHandle remote_process_handle, | 51 PluginDispatcher::PluginDispatcher(base::ProcessHandle remote_process_handle, |
51 GetInterfaceFunc get_interface) | 52 GetInterfaceFunc get_interface) |
52 : Dispatcher(remote_process_handle, get_interface), | 53 : Dispatcher(remote_process_handle, get_interface), |
53 plugin_delegate_(NULL), | 54 plugin_delegate_(NULL), |
54 received_preferences_(false), | 55 received_preferences_(false), |
55 plugin_dispatcher_id_(0) { | 56 plugin_dispatcher_id_(0) { |
56 SetSerializationRules(new PluginVarSerializationRules); | 57 SetSerializationRules(new PluginVarSerializationRules); |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 // once they're set. The user will have to restart to get new font prefs | 239 // once they're set. The user will have to restart to get new font prefs |
239 // propogated to plugins. | 240 // propogated to plugins. |
240 if (!received_preferences_) { | 241 if (!received_preferences_) { |
241 received_preferences_ = true; | 242 received_preferences_ = true; |
242 preferences_ = prefs; | 243 preferences_ = prefs; |
243 } | 244 } |
244 } | 245 } |
245 | 246 |
246 } // namespace proxy | 247 } // namespace proxy |
247 } // namespace ppapi | 248 } // namespace ppapi |
OLD | NEW |