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

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

Issue 10091003: Convert flash to thunk (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 27 matching lines...) Expand all
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 "third_party/skia/include/core/SkRefCnt.h" 41 #include "third_party/skia/include/core/SkRefCnt.h"
42 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCanvas.h" 42 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCanvas.h"
43 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" 43 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" 44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h"
45 #include "ui/base/ime/text_input_type.h" 45 #include "ui/base/ime/text_input_type.h"
46 #include "ui/gfx/rect.h" 46 #include "ui/gfx/rect.h"
47 #include "webkit/plugins/ppapi/plugin_delegate.h" 47 #include "webkit/plugins/ppapi/plugin_delegate.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/webkit_plugins_export.h" 50 #include "webkit/plugins/webkit_plugins_export.h"
50 51
51 struct PP_Point; 52 struct PP_Point;
52 53
53 class SkBitmap; 54 class SkBitmap;
54 class TransportDIB; 55 class TransportDIB;
55 56
56 namespace WebKit { 57 namespace WebKit {
57 class WebInputEvent; 58 class WebInputEvent;
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 // - normal : desired_fullscreen_state_ == false 283 // - normal : desired_fullscreen_state_ == false
283 // view_data_.is_fullscreen == false 284 // view_data_.is_fullscreen == false
284 // - fullscreen pending: desired_fullscreen_state_ == true 285 // - fullscreen pending: desired_fullscreen_state_ == true
285 // view_data_.is_fullscreen == false 286 // view_data_.is_fullscreen == false
286 // - fullscreen : desired_fullscreen_state_ == true 287 // - fullscreen : desired_fullscreen_state_ == true
287 // view_data_.is_fullscreen == true 288 // view_data_.is_fullscreen == true
288 // - normal pending : desired_fullscreen_state_ = false 289 // - normal pending : desired_fullscreen_state_ = false
289 // view_data_.is_fullscreen = true 290 // view_data_.is_fullscreen = true
290 bool IsFullscreenOrPending(); 291 bool IsFullscreenOrPending();
291 292
293 bool flash_fullscreen() const { return flash_fullscreen_; }
294
292 // Switches between fullscreen and normal mode. The transition is 295 // Switches between fullscreen and normal mode. The transition is
293 // asynchronous. WebKit will trigger corresponding VewChanged calls. 296 // asynchronous. WebKit will trigger corresponding VewChanged calls.
294 // Returns true on success, false on failure (e.g. trying to enter fullscreen 297 // Returns true on success, false on failure (e.g. trying to enter fullscreen
295 // when not processing a user gesture or trying to set fullscreen when 298 // when not processing a user gesture or trying to set fullscreen when
296 // already in fullscreen mode). 299 // already in fullscreen mode).
297 bool SetFullscreen(bool fullscreen); 300 bool SetFullscreen(bool fullscreen);
298 301
299 // Implementation of PPB_Flash. 302 // Implementation of PPB_Flash.
300 int32_t Navigate(PPB_URLRequestInfo_Impl* request, 303 int32_t Navigate(PPB_URLRequestInfo_Impl* request,
301 const char* target, 304 const char* target,
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 OVERRIDE; 350 OVERRIDE;
348 virtual uint32_t GetAudioHardwareOutputBufferSize(PP_Instance instance) 351 virtual uint32_t GetAudioHardwareOutputBufferSize(PP_Instance instance)
349 OVERRIDE; 352 OVERRIDE;
350 virtual PP_Var GetDefaultCharSet(PP_Instance instance) OVERRIDE; 353 virtual PP_Var GetDefaultCharSet(PP_Instance instance) OVERRIDE;
351 virtual PP_Var GetFontFamilies(PP_Instance instance) OVERRIDE; 354 virtual PP_Var GetFontFamilies(PP_Instance instance) OVERRIDE;
352 virtual void NumberOfFindResultsChanged(PP_Instance instance, 355 virtual void NumberOfFindResultsChanged(PP_Instance instance,
353 int32_t total, 356 int32_t total,
354 PP_Bool final_result) OVERRIDE; 357 PP_Bool final_result) OVERRIDE;
355 virtual void SelectedFindResultChanged(PP_Instance instance, 358 virtual void SelectedFindResultChanged(PP_Instance instance,
356 int32_t index) OVERRIDE; 359 int32_t index) OVERRIDE;
357 virtual PP_Bool FlashIsFullscreen(PP_Instance instance) OVERRIDE;
358 virtual PP_Bool FlashSetFullscreen(PP_Instance instance,
359 PP_Bool fullscreen) OVERRIDE;
360 virtual PP_Bool FlashGetScreenSize(PP_Instance instance,
361 PP_Size* size) OVERRIDE;
362 virtual PP_Bool SetFullscreen(PP_Instance instance, 360 virtual PP_Bool SetFullscreen(PP_Instance instance,
363 PP_Bool fullscreen) OVERRIDE; 361 PP_Bool fullscreen) OVERRIDE;
364 virtual PP_Bool GetScreenSize(PP_Instance instance, PP_Size* size) 362 virtual PP_Bool GetScreenSize(PP_Instance instance, PP_Size* size)
365 OVERRIDE; 363 OVERRIDE;
364 virtual ::ppapi::thunk::PPB_Flash_API* GetFlashAPI() OVERRIDE;
366 virtual int32_t RequestInputEvents(PP_Instance instance, 365 virtual int32_t RequestInputEvents(PP_Instance instance,
367 uint32_t event_classes) OVERRIDE; 366 uint32_t event_classes) OVERRIDE;
368 virtual int32_t RequestFilteringInputEvents(PP_Instance instance, 367 virtual int32_t RequestFilteringInputEvents(PP_Instance instance,
369 uint32_t event_classes) OVERRIDE; 368 uint32_t event_classes) OVERRIDE;
370 virtual void ClearInputEventRequest(PP_Instance instance, 369 virtual void ClearInputEventRequest(PP_Instance instance,
371 uint32_t event_classes) OVERRIDE; 370 uint32_t event_classes) OVERRIDE;
372 virtual void ClosePendingUserGesture(PP_Instance instance, 371 virtual void ClosePendingUserGesture(PP_Instance instance,
373 PP_TimeTicks timestamp); 372 PP_TimeTicks timestamp);
374 virtual void ZoomChanged(PP_Instance instance, double factor) OVERRIDE; 373 virtual void ZoomChanged(PP_Instance instance, double factor) OVERRIDE;
375 virtual void ZoomLimitsChanged(PP_Instance instance, 374 virtual void ZoomLimitsChanged(PP_Instance instance,
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 std::string surrounding_text_; 640 std::string surrounding_text_;
642 size_t selection_caret_; 641 size_t selection_caret_;
643 size_t selection_anchor_; 642 size_t selection_anchor_;
644 643
645 PP_CompletionCallback lock_mouse_callback_; 644 PP_CompletionCallback lock_mouse_callback_;
646 645
647 // Track pending user gestures so out-of-process plugins can respond to 646 // Track pending user gestures so out-of-process plugins can respond to
648 // a user gesture after it has been processed. 647 // a user gesture after it has been processed.
649 PP_TimeTicks pending_user_gesture_; 648 PP_TimeTicks pending_user_gesture_;
650 649
650 // The Flash proxy is associated with the instance.
651 PPB_Flash_Impl flash_impl_;
652
651 DISALLOW_COPY_AND_ASSIGN(PluginInstance); 653 DISALLOW_COPY_AND_ASSIGN(PluginInstance);
652 }; 654 };
653 655
654 } // namespace ppapi 656 } // namespace ppapi
655 } // namespace webkit 657 } // namespace webkit
656 658
657 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 659 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698