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

Side by Side Diff: webkit/plugins/ppapi/ppapi_plugin_instance.cc

Issue 9566022: Rename NaCl/pepper gamepad interface from _dev to stable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 9 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 | « webkit/plugins/ppapi/ppapi_plugin_instance.h ('k') | no next file » | 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) 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"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/stringprintf.h" 12 #include "base/stringprintf.h"
13 #include "base/utf_offset_string_conversions.h" 13 #include "base/utf_offset_string_conversions.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "ppapi/c/dev/ppb_find_dev.h" 15 #include "ppapi/c/dev/ppb_find_dev.h"
16 #include "ppapi/c/dev/ppb_gamepad_dev.h"
17 #include "ppapi/c/dev/ppb_zoom_dev.h" 16 #include "ppapi/c/dev/ppb_zoom_dev.h"
18 #include "ppapi/c/dev/ppp_find_dev.h" 17 #include "ppapi/c/dev/ppp_find_dev.h"
19 #include "ppapi/c/dev/ppp_selection_dev.h" 18 #include "ppapi/c/dev/ppp_selection_dev.h"
20 #include "ppapi/c/dev/ppp_zoom_dev.h" 19 #include "ppapi/c/dev/ppp_zoom_dev.h"
21 #include "ppapi/c/pp_rect.h" 20 #include "ppapi/c/pp_rect.h"
22 #include "ppapi/c/ppb_audio_config.h" 21 #include "ppapi/c/ppb_audio_config.h"
23 #include "ppapi/c/ppb_core.h" 22 #include "ppapi/c/ppb_core.h"
23 #include "ppapi/c/ppb_gamepad.h"
24 #include "ppapi/c/ppp_input_event.h" 24 #include "ppapi/c/ppp_input_event.h"
25 #include "ppapi/c/ppp_instance.h" 25 #include "ppapi/c/ppp_instance.h"
26 #include "ppapi/c/ppp_messaging.h" 26 #include "ppapi/c/ppp_messaging.h"
27 #include "ppapi/c/ppp_mouse_lock.h" 27 #include "ppapi/c/ppp_mouse_lock.h"
28 #include "ppapi/c/private/ppp_instance_private.h" 28 #include "ppapi/c/private/ppp_instance_private.h"
29 #include "ppapi/shared_impl/ppb_input_event_shared.h" 29 #include "ppapi/shared_impl/ppb_input_event_shared.h"
30 #include "ppapi/shared_impl/ppb_url_util_shared.h" 30 #include "ppapi/shared_impl/ppb_url_util_shared.h"
31 #include "ppapi/shared_impl/ppb_view_shared.h" 31 #include "ppapi/shared_impl/ppb_view_shared.h"
32 #include "ppapi/shared_impl/ppp_instance_combined.h" 32 #include "ppapi/shared_impl/ppp_instance_combined.h"
33 #include "ppapi/shared_impl/resource.h" 33 #include "ppapi/shared_impl/resource.h"
(...skipping 1304 matching lines...) Expand 10 before | Expand all | Expand 10 after
1338 NOTREACHED(); 1338 NOTREACHED();
1339 return false; 1339 return false;
1340 } 1340 }
1341 #else 1341 #else
1342 //FIXME 1342 //FIXME
1343 return container_->isRectTopmost(rect); 1343 return container_->isRectTopmost(rect);
1344 #endif 1344 #endif
1345 } 1345 }
1346 1346
1347 void PluginInstance::SampleGamepads(PP_Instance instance, 1347 void PluginInstance::SampleGamepads(PP_Instance instance,
1348 PP_GamepadsSampleData_Dev* data) { 1348 PP_GamepadsSampleData* data) {
1349 WebKit::WebGamepads webkit_data; 1349 WebKit::WebGamepads webkit_data;
1350 delegate()->SampleGamepads(&webkit_data); 1350 delegate()->SampleGamepads(&webkit_data);
1351 ConvertWebKitGamepadData(webkit_data, data); 1351 ConvertWebKitGamepadData(webkit_data, data);
1352 } 1352 }
1353 1353
1354 bool PluginInstance::IsViewAccelerated() { 1354 bool PluginInstance::IsViewAccelerated() {
1355 if (!container_) 1355 if (!container_)
1356 return false; 1356 return false;
1357 1357
1358 WebDocument document = container_->element().document(); 1358 WebDocument document = container_->element().document();
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
2080 screen_size_for_fullscreen_ = gfx::Size(); 2080 screen_size_for_fullscreen_ = gfx::Size();
2081 WebElement element = container_->element(); 2081 WebElement element = container_->element();
2082 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_); 2082 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
2083 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_); 2083 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
2084 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_); 2084 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
2085 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_); 2085 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
2086 } 2086 }
2087 2087
2088 } // namespace ppapi 2088 } // namespace ppapi
2089 } // namespace webkit 2089 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/ppapi_plugin_instance.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698