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

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

Issue 10081020: PPAPI: Make blocking completion callbacks work. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try again Created 8 years, 7 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 #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
6 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 6 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 19 matching lines...) Expand all
30 #include "ppapi/c/ppb_audio_config.h" 30 #include "ppapi/c/ppb_audio_config.h"
31 #include "ppapi/c/ppb_input_event.h" 31 #include "ppapi/c/ppb_input_event.h"
32 #include "ppapi/c/ppb_gamepad.h" 32 #include "ppapi/c/ppb_gamepad.h"
33 #include "ppapi/c/ppp_graphics_3d.h" 33 #include "ppapi/c/ppp_graphics_3d.h"
34 #include "ppapi/c/ppp_input_event.h" 34 #include "ppapi/c/ppp_input_event.h"
35 #include "ppapi/c/ppp_messaging.h" 35 #include "ppapi/c/ppp_messaging.h"
36 #include "ppapi/c/ppp_mouse_lock.h" 36 #include "ppapi/c/ppp_mouse_lock.h"
37 #include "ppapi/c/private/ppp_instance_private.h" 37 #include "ppapi/c/private/ppp_instance_private.h"
38 #include "ppapi/shared_impl/ppb_instance_shared.h" 38 #include "ppapi/shared_impl/ppb_instance_shared.h"
39 #include "ppapi/shared_impl/ppb_view_shared.h" 39 #include "ppapi/shared_impl/ppb_view_shared.h"
40 #include "ppapi/shared_impl/tracked_callback.h"
40 #include "third_party/skia/include/core/SkRefCnt.h" 41 #include "third_party/skia/include/core/SkRefCnt.h"
41 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCanvas.h" 42 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCanvas.h"
42 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" 43 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" 44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h"
44 #include "ui/base/ime/text_input_type.h" 45 #include "ui/base/ime/text_input_type.h"
45 #include "ui/gfx/rect.h" 46 #include "ui/gfx/rect.h"
46 #include "webkit/plugins/ppapi/plugin_delegate.h" 47 #include "webkit/plugins/ppapi/plugin_delegate.h"
47 #include "webkit/plugins/ppapi/ppb_flash_impl.h" 48 #include "webkit/plugins/ppapi/ppb_flash_impl.h"
48 #include "webkit/plugins/ppapi/ppp_pdf.h" 49 #include "webkit/plugins/ppapi/ppp_pdf.h"
49 #include "webkit/plugins/ppapi/resource_creation_impl.h" 50 #include "webkit/plugins/ppapi/resource_creation_impl.h"
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 PP_TimeTicks timestamp); 362 PP_TimeTicks timestamp);
362 virtual void ZoomChanged(PP_Instance instance, double factor) OVERRIDE; 363 virtual void ZoomChanged(PP_Instance instance, double factor) OVERRIDE;
363 virtual void ZoomLimitsChanged(PP_Instance instance, 364 virtual void ZoomLimitsChanged(PP_Instance instance,
364 double minimum_factor, 365 double minimum_factor,
365 double maximium_factor) OVERRIDE; 366 double maximium_factor) OVERRIDE;
366 virtual void PostMessage(PP_Instance instance, PP_Var message) OVERRIDE; 367 virtual void PostMessage(PP_Instance instance, PP_Var message) OVERRIDE;
367 virtual PP_Bool SetCursor(PP_Instance instance, 368 virtual PP_Bool SetCursor(PP_Instance instance,
368 PP_MouseCursor_Type type, 369 PP_MouseCursor_Type type,
369 PP_Resource image, 370 PP_Resource image,
370 const PP_Point* hot_spot) OVERRIDE; 371 const PP_Point* hot_spot) OVERRIDE;
371 virtual int32_t LockMouse(PP_Instance instance, 372 virtual int32_t LockMouse(
372 PP_CompletionCallback callback) OVERRIDE; 373 PP_Instance instance,
374 scoped_refptr< ::ppapi::TrackedCallback> callback) OVERRIDE;
373 virtual void UnlockMouse(PP_Instance instance) OVERRIDE; 375 virtual void UnlockMouse(PP_Instance instance) OVERRIDE;
374 virtual void SetTextInputType(PP_Instance instance, 376 virtual void SetTextInputType(PP_Instance instance,
375 PP_TextInput_Type type) OVERRIDE; 377 PP_TextInput_Type type) OVERRIDE;
376 virtual void UpdateCaretPosition(PP_Instance instance, 378 virtual void UpdateCaretPosition(PP_Instance instance,
377 const PP_Rect& caret, 379 const PP_Rect& caret,
378 const PP_Rect& bounding_box) OVERRIDE; 380 const PP_Rect& bounding_box) OVERRIDE;
379 virtual void CancelCompositionText(PP_Instance instance) OVERRIDE; 381 virtual void CancelCompositionText(PP_Instance instance) OVERRIDE;
380 virtual void SelectionChanged(PP_Instance instance) OVERRIDE; 382 virtual void SelectionChanged(PP_Instance instance) OVERRIDE;
381 virtual void UpdateSurroundingText(PP_Instance instance, 383 virtual void UpdateSurroundingText(PP_Instance instance,
382 const char* text, 384 const char* text,
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
626 ui::TextInputType text_input_type_; 628 ui::TextInputType text_input_type_;
627 gfx::Rect text_input_caret_; 629 gfx::Rect text_input_caret_;
628 gfx::Rect text_input_caret_bounds_; 630 gfx::Rect text_input_caret_bounds_;
629 bool text_input_caret_set_; 631 bool text_input_caret_set_;
630 632
631 // Text selection status. 633 // Text selection status.
632 std::string surrounding_text_; 634 std::string surrounding_text_;
633 size_t selection_caret_; 635 size_t selection_caret_;
634 size_t selection_anchor_; 636 size_t selection_anchor_;
635 637
636 PP_CompletionCallback lock_mouse_callback_; 638 scoped_refptr< ::ppapi::TrackedCallback> lock_mouse_callback_;
637 639
638 // Track pending user gestures so out-of-process plugins can respond to 640 // Track pending user gestures so out-of-process plugins can respond to
639 // a user gesture after it has been processed. 641 // a user gesture after it has been processed.
640 PP_TimeTicks pending_user_gesture_; 642 PP_TimeTicks pending_user_gesture_;
641 643
642 // The Flash proxy is associated with the instance. 644 // The Flash proxy is associated with the instance.
643 PPB_Flash_Impl flash_impl_; 645 PPB_Flash_Impl flash_impl_;
644 646
645 DISALLOW_COPY_AND_ASSIGN(PluginInstance); 647 DISALLOW_COPY_AND_ASSIGN(PluginInstance);
646 }; 648 };
647 649
648 } // namespace ppapi 650 } // namespace ppapi
649 } // namespace webkit 651 } // namespace webkit
650 652
651 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 653 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698