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

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: Updated TestURLLoader to test blocking callbacks. Created 8 years, 8 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 20 matching lines...) Expand all
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/function_group_base.h" 38 #include "ppapi/shared_impl/function_group_base.h"
39 #include "ppapi/shared_impl/ppb_instance_shared.h" 39 #include "ppapi/shared_impl/ppb_instance_shared.h"
40 #include "ppapi/shared_impl/ppb_view_shared.h" 40 #include "ppapi/shared_impl/ppb_view_shared.h"
41 #include "ppapi/shared_impl/tracked_callback.h"
41 #include "third_party/skia/include/core/SkRefCnt.h" 42 #include "third_party/skia/include/core/SkRefCnt.h"
42 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCanvas.h" 43 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCanvas.h"
43 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" 44 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" 45 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h"
45 #include "ui/base/ime/text_input_type.h" 46 #include "ui/base/ime/text_input_type.h"
46 #include "ui/gfx/rect.h" 47 #include "ui/gfx/rect.h"
47 #include "webkit/plugins/ppapi/plugin_delegate.h" 48 #include "webkit/plugins/ppapi/plugin_delegate.h"
48 #include "webkit/plugins/ppapi/ppp_pdf.h" 49 #include "webkit/plugins/ppapi/ppp_pdf.h"
49 #include "webkit/plugins/webkit_plugins_export.h" 50 #include "webkit/plugins/webkit_plugins_export.h"
50 51
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 virtual void ZoomChanged(PP_Instance instance, double factor) OVERRIDE; 375 virtual void ZoomChanged(PP_Instance instance, double factor) OVERRIDE;
375 virtual void ZoomLimitsChanged(PP_Instance instance, 376 virtual void ZoomLimitsChanged(PP_Instance instance,
376 double minimum_factor, 377 double minimum_factor,
377 double maximium_factor) OVERRIDE; 378 double maximium_factor) OVERRIDE;
378 virtual void PostMessage(PP_Instance instance, PP_Var message) OVERRIDE; 379 virtual void PostMessage(PP_Instance instance, PP_Var message) OVERRIDE;
379 virtual PP_Bool SetCursor(PP_Instance instance, 380 virtual PP_Bool SetCursor(PP_Instance instance,
380 PP_MouseCursor_Type type, 381 PP_MouseCursor_Type type,
381 PP_Resource image, 382 PP_Resource image,
382 const PP_Point* hot_spot) OVERRIDE; 383 const PP_Point* hot_spot) OVERRIDE;
383 virtual int32_t LockMouse(PP_Instance instance, 384 virtual int32_t LockMouse(PP_Instance instance,
384 PP_CompletionCallback callback) OVERRIDE; 385 ::ppapi::ApiCallbackType callback) OVERRIDE;
385 virtual void UnlockMouse(PP_Instance instance) OVERRIDE; 386 virtual void UnlockMouse(PP_Instance instance) OVERRIDE;
386 virtual PP_Var ResolveRelativeToDocument( 387 virtual PP_Var ResolveRelativeToDocument(
387 PP_Instance instance, 388 PP_Instance instance,
388 PP_Var relative, 389 PP_Var relative,
389 PP_URLComponents_Dev* components) OVERRIDE; 390 PP_URLComponents_Dev* components) OVERRIDE;
390 virtual PP_Bool DocumentCanRequest(PP_Instance instance, PP_Var url) OVERRIDE; 391 virtual PP_Bool DocumentCanRequest(PP_Instance instance, PP_Var url) OVERRIDE;
391 virtual PP_Bool DocumentCanAccessDocument(PP_Instance instance, 392 virtual PP_Bool DocumentCanAccessDocument(PP_Instance instance,
392 PP_Instance target) OVERRIDE; 393 PP_Instance target) OVERRIDE;
393 virtual PP_Var GetDocumentURL(PP_Instance instance, 394 virtual PP_Var GetDocumentURL(PP_Instance instance,
394 PP_URLComponents_Dev* components) OVERRIDE; 395 PP_URLComponents_Dev* components) OVERRIDE;
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 ui::TextInputType text_input_type_; 636 ui::TextInputType text_input_type_;
636 gfx::Rect text_input_caret_; 637 gfx::Rect text_input_caret_;
637 gfx::Rect text_input_caret_bounds_; 638 gfx::Rect text_input_caret_bounds_;
638 bool text_input_caret_set_; 639 bool text_input_caret_set_;
639 640
640 // Text selection status. 641 // Text selection status.
641 std::string surrounding_text_; 642 std::string surrounding_text_;
642 size_t selection_caret_; 643 size_t selection_caret_;
643 size_t selection_anchor_; 644 size_t selection_anchor_;
644 645
645 PP_CompletionCallback lock_mouse_callback_; 646 scoped_refptr< ::ppapi::TrackedCallback> lock_mouse_callback_;
646 647
647 // Track pending user gestures so out-of-process plugins can respond to 648 // Track pending user gestures so out-of-process plugins can respond to
648 // a user gesture after it has been processed. 649 // a user gesture after it has been processed.
649 PP_TimeTicks pending_user_gesture_; 650 PP_TimeTicks pending_user_gesture_;
650 651
651 DISALLOW_COPY_AND_ASSIGN(PluginInstance); 652 DISALLOW_COPY_AND_ASSIGN(PluginInstance);
652 }; 653 };
653 654
654 } // namespace ppapi 655 } // namespace ppapi
655 } // namespace webkit 656 } // namespace webkit
656 657
657 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 658 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698