Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/linked_ptr.h" | 10 #include "base/memory/linked_ptr.h" |
| (...skipping 2326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2337 PP_Bool PluginInstance::GetScreenSize(PP_Instance instance, PP_Size* size) { | 2337 PP_Bool PluginInstance::GetScreenSize(PP_Instance instance, PP_Size* size) { |
| 2338 gfx::Size screen_size = delegate()->GetScreenSize(); | 2338 gfx::Size screen_size = delegate()->GetScreenSize(); |
| 2339 *size = PP_MakeSize(screen_size.width(), screen_size.height()); | 2339 *size = PP_MakeSize(screen_size.width(), screen_size.height()); |
| 2340 return PP_TRUE; | 2340 return PP_TRUE; |
| 2341 } | 2341 } |
| 2342 | 2342 |
| 2343 ::ppapi::thunk::PPB_Flash_API* PluginInstance::GetFlashAPI() { | 2343 ::ppapi::thunk::PPB_Flash_API* PluginInstance::GetFlashAPI() { |
| 2344 return &flash_impl_; | 2344 return &flash_impl_; |
| 2345 } | 2345 } |
| 2346 | 2346 |
| 2347 ::ppapi::thunk::PPB_Flash_Functions_API* | |
| 2348 PluginInstance::GetFlashFunctionsAPI(PP_Instance instance) { | |
|
yzshen1
2012/10/05 18:16:46
unused parameters should be surrounded by /* and *
raymes
2012/10/08 17:08:50
Done.
| |
| 2349 NOTIMPLEMENTED(); | |
| 2350 return NULL; | |
| 2351 } | |
| 2352 | |
| 2347 ::ppapi::thunk::PPB_Gamepad_API* PluginInstance::GetGamepadAPI( | 2353 ::ppapi::thunk::PPB_Gamepad_API* PluginInstance::GetGamepadAPI( |
| 2348 PP_Instance /* instance */) { | 2354 PP_Instance /* instance */) { |
| 2349 return &gamepad_impl_; | 2355 return &gamepad_impl_; |
| 2350 } | 2356 } |
| 2351 | 2357 |
| 2352 int32_t PluginInstance::RequestInputEvents(PP_Instance instance, | 2358 int32_t PluginInstance::RequestInputEvents(PP_Instance instance, |
| 2353 uint32_t event_classes) { | 2359 uint32_t event_classes) { |
| 2354 input_event_mask_ |= event_classes; | 2360 input_event_mask_ |= event_classes; |
| 2355 filtered_input_event_mask_ &= ~(event_classes); | 2361 filtered_input_event_mask_ &= ~(event_classes); |
| 2356 if (event_classes & PP_INPUTEVENT_CLASS_TOUCH) | 2362 if (event_classes & PP_INPUTEVENT_CLASS_TOUCH) |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2689 screen_size_for_fullscreen_ = gfx::Size(); | 2695 screen_size_for_fullscreen_ = gfx::Size(); |
| 2690 WebElement element = container_->element(); | 2696 WebElement element = container_->element(); |
| 2691 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_); | 2697 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_); |
| 2692 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_); | 2698 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_); |
| 2693 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_); | 2699 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_); |
| 2694 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_); | 2700 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_); |
| 2695 } | 2701 } |
| 2696 | 2702 |
| 2697 } // namespace ppapi | 2703 } // namespace ppapi |
| 2698 } // namespace webkit | 2704 } // namespace webkit |
| OLD | NEW |