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

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

Issue 18671004: PPAPI: Move IMEInputEvent and TextInput to stable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressing comments Created 7 years, 5 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
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/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/linked_ptr.h" 11 #include "base/memory/linked_ptr.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/stl_util.h" 13 #include "base/stl_util.h"
14 #include "base/strings/stringprintf.h" 14 #include "base/strings/stringprintf.h"
15 #include "base/strings/utf_offset_string_conversions.h" 15 #include "base/strings/utf_offset_string_conversions.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "base/time/time.h" 17 #include "base/time/time.h"
18 #include "cc/layers/texture_layer.h" 18 #include "cc/layers/texture_layer.h"
19 #include "ppapi/c/dev/ppb_find_dev.h" 19 #include "ppapi/c/dev/ppb_find_dev.h"
20 #include "ppapi/c/dev/ppb_zoom_dev.h" 20 #include "ppapi/c/dev/ppb_zoom_dev.h"
21 #include "ppapi/c/dev/ppp_find_dev.h" 21 #include "ppapi/c/dev/ppp_find_dev.h"
22 #include "ppapi/c/dev/ppp_selection_dev.h" 22 #include "ppapi/c/dev/ppp_selection_dev.h"
23 #include "ppapi/c/dev/ppp_text_input_dev.h"
24 #include "ppapi/c/dev/ppp_zoom_dev.h" 23 #include "ppapi/c/dev/ppp_zoom_dev.h"
25 #include "ppapi/c/pp_rect.h" 24 #include "ppapi/c/pp_rect.h"
26 #include "ppapi/c/ppb_audio_config.h" 25 #include "ppapi/c/ppb_audio_config.h"
27 #include "ppapi/c/ppb_core.h" 26 #include "ppapi/c/ppb_core.h"
28 #include "ppapi/c/ppb_gamepad.h" 27 #include "ppapi/c/ppb_gamepad.h"
29 #include "ppapi/c/ppp_input_event.h" 28 #include "ppapi/c/ppp_input_event.h"
30 #include "ppapi/c/ppp_instance.h" 29 #include "ppapi/c/ppp_instance.h"
31 #include "ppapi/c/ppp_messaging.h" 30 #include "ppapi/c/ppp_messaging.h"
32 #include "ppapi/c/ppp_mouse_lock.h" 31 #include "ppapi/c/ppp_mouse_lock.h"
32 #include "ppapi/c/ppp_text_input.h"
33 #include "ppapi/c/private/ppp_instance_private.h" 33 #include "ppapi/c/private/ppp_instance_private.h"
34 #include "ppapi/shared_impl/ppapi_preferences.h" 34 #include "ppapi/shared_impl/ppapi_preferences.h"
35 #include "ppapi/shared_impl/ppb_gamepad_shared.h" 35 #include "ppapi/shared_impl/ppb_gamepad_shared.h"
36 #include "ppapi/shared_impl/ppb_input_event_shared.h" 36 #include "ppapi/shared_impl/ppb_input_event_shared.h"
37 #include "ppapi/shared_impl/ppb_url_util_shared.h" 37 #include "ppapi/shared_impl/ppb_url_util_shared.h"
38 #include "ppapi/shared_impl/ppb_view_shared.h" 38 #include "ppapi/shared_impl/ppb_view_shared.h"
39 #include "ppapi/shared_impl/ppp_instance_combined.h" 39 #include "ppapi/shared_impl/ppp_instance_combined.h"
40 #include "ppapi/shared_impl/resource.h" 40 #include "ppapi/shared_impl/resource.h"
41 #include "ppapi/shared_impl/scoped_pp_resource.h" 41 #include "ppapi/shared_impl/scoped_pp_resource.h"
42 #include "ppapi/shared_impl/time_conversion.h" 42 #include "ppapi/shared_impl/time_conversion.h"
(...skipping 1189 matching lines...) Expand 10 before | Expand all | Expand 10 after
1232 plugin_selection_interface_ = 1232 plugin_selection_interface_ =
1233 static_cast<const PPP_Selection_Dev*>(module_->GetPluginInterface( 1233 static_cast<const PPP_Selection_Dev*>(module_->GetPluginInterface(
1234 PPP_SELECTION_DEV_INTERFACE)); 1234 PPP_SELECTION_DEV_INTERFACE));
1235 } 1235 }
1236 return !!plugin_selection_interface_; 1236 return !!plugin_selection_interface_;
1237 } 1237 }
1238 1238
1239 bool PluginInstance::LoadTextInputInterface() { 1239 bool PluginInstance::LoadTextInputInterface() {
1240 if (!plugin_textinput_interface_) { 1240 if (!plugin_textinput_interface_) {
1241 plugin_textinput_interface_ = 1241 plugin_textinput_interface_ =
1242 static_cast<const PPP_TextInput_Dev*>(module_->GetPluginInterface( 1242 static_cast<const PPP_TextInput*>(module_->GetPluginInterface(
1243 PPP_TEXTINPUT_DEV_INTERFACE)); 1243 PPP_TEXTINPUT_INTERFACE));
1244 } 1244 }
1245 1245
1246 return !!plugin_textinput_interface_; 1246 return !!plugin_textinput_interface_;
1247 } 1247 }
1248 1248
1249 bool PluginInstance::LoadZoomInterface() { 1249 bool PluginInstance::LoadZoomInterface() {
1250 if (!plugin_zoom_interface_) { 1250 if (!plugin_zoom_interface_) {
1251 plugin_zoom_interface_ = 1251 plugin_zoom_interface_ =
1252 static_cast<const PPP_Zoom_Dev*>(module_->GetPluginInterface( 1252 static_cast<const PPP_Zoom_Dev*>(module_->GetPluginInterface(
1253 PPP_ZOOM_DEV_INTERFACE)); 1253 PPP_ZOOM_DEV_INTERFACE));
(...skipping 1345 matching lines...) Expand 10 before | Expand all | Expand 10 after
2599 screen_size_for_fullscreen_ = gfx::Size(); 2599 screen_size_for_fullscreen_ = gfx::Size();
2600 WebElement element = container_->element(); 2600 WebElement element = container_->element();
2601 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_); 2601 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
2602 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_); 2602 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
2603 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_); 2603 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
2604 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_); 2604 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
2605 } 2605 }
2606 2606
2607 } // namespace ppapi 2607 } // namespace ppapi
2608 } // namespace webkit 2608 } // namespace webkit
OLDNEW
« ppapi/thunk/ppb_input_event_thunk.cc ('K') | « 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