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 "webkit/plugins/ppapi/ppapi_plugin_instance.h" | 5 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
192 *output = PP_MakeRectFromXYWH(input.x(), input.y(), | 192 *output = PP_MakeRectFromXYWH(input.x(), input.y(), |
193 input.width(), input.height()); | 193 input.width(), input.height()); |
194 } | 194 } |
195 | 195 |
196 } // namespace | 196 } // namespace |
197 | 197 |
198 // static | 198 // static |
199 PluginInstance* PluginInstance::Create1_0(PluginDelegate* delegate, | 199 PluginInstance* PluginInstance::Create1_0(PluginDelegate* delegate, |
200 PluginModule* module, | 200 PluginModule* module, |
201 const void* ppp_instance_if_1_0) { | 201 const void* ppp_instance_if_1_0) { |
202 const PPP_Instance_1_0* interface = | 202 const PPP_Instance_1_0* instance = |
203 static_cast<const PPP_Instance_1_0*>(ppp_instance_if_1_0); | 203 static_cast<const PPP_Instance_1_0*>(ppp_instance_if_1_0); |
204 return new PluginInstance( | 204 return new PluginInstance( |
205 delegate, | 205 delegate, |
206 module, | 206 module, |
207 new ::ppapi::PPP_Instance_Combined(*interface)); | 207 new ::ppapi::PPP_Instance_Combined(*instance)); |
208 } | 208 } |
209 | 209 |
210 PluginInstance::PluginInstance( | 210 PluginInstance::PluginInstance( |
211 PluginDelegate* delegate, | 211 PluginDelegate* delegate, |
212 PluginModule* module, | 212 PluginModule* module, |
213 ::ppapi::PPP_Instance_Combined* instance_interface) | 213 ::ppapi::PPP_Instance_Combined* instance_interface) |
214 : delegate_(delegate), | 214 : delegate_(delegate), |
215 module_(module), | 215 module_(module), |
216 instance_interface_(instance_interface), | 216 instance_interface_(instance_interface), |
217 pp_instance_(0), | 217 pp_instance_(0), |
(...skipping 1268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1486 } | 1486 } |
1487 | 1487 |
1488 void PluginInstance::DoSetCursor(WebCursorInfo* cursor) { | 1488 void PluginInstance::DoSetCursor(WebCursorInfo* cursor) { |
1489 cursor_.reset(cursor); | 1489 cursor_.reset(cursor); |
1490 if (fullscreen_container_) | 1490 if (fullscreen_container_) |
1491 fullscreen_container_->DidChangeCursor(*cursor); | 1491 fullscreen_container_->DidChangeCursor(*cursor); |
1492 } | 1492 } |
1493 | 1493 |
1494 } // namespace ppapi | 1494 } // namespace ppapi |
1495 } // namespace webkit | 1495 } // namespace webkit |
OLD | NEW |