OLD | NEW |
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 CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ |
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #import <Cocoa/Cocoa.h> | 9 #import <Cocoa/Cocoa.h> |
10 #include <list> | 10 #include <list> |
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
278 int32 width, | 278 int32 width, |
279 int32 height, | 279 int32 height, |
280 TransportDIB::Handle transport_dib) OVERRIDE; | 280 TransportDIB::Handle transport_dib) OVERRIDE; |
281 virtual void AcceleratedSurfaceBuffersSwapped( | 281 virtual void AcceleratedSurfaceBuffersSwapped( |
282 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, | 282 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, |
283 int gpu_host_id) OVERRIDE; | 283 int gpu_host_id) OVERRIDE; |
284 virtual void AcceleratedSurfacePostSubBuffer( | 284 virtual void AcceleratedSurfacePostSubBuffer( |
285 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, | 285 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, |
286 int gpu_host_id) OVERRIDE; | 286 int gpu_host_id) OVERRIDE; |
287 virtual void AcceleratedSurfaceSuspend() OVERRIDE; | 287 virtual void AcceleratedSurfaceSuspend() OVERRIDE; |
| 288 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE; |
| 289 virtual void AboutToWaitForUpdateMsg() OVERRIDE; |
288 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; | 290 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; |
289 virtual gfx::Rect GetRootWindowBounds() OVERRIDE; | 291 virtual gfx::Rect GetRootWindowBounds() OVERRIDE; |
290 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; | 292 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; |
291 | 293 |
292 void DrawAcceleratedSurfaceInstance( | 294 void DrawAcceleratedSurfaceInstance( |
293 CGLContextObj context, | 295 CGLContextObj context, |
294 gfx::PluginWindowHandle plugin_handle, | 296 gfx::PluginWindowHandle plugin_handle, |
295 NSSize size); | 297 NSSize size); |
296 // Forces the textures associated with any accelerated plugin instances | 298 // Forces the textures associated with any accelerated plugin instances |
297 // to be reloaded. | 299 // to be reloaded. |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
413 | 415 |
414 // The text to be shown in the tooltip, supplied by the renderer. | 416 // The text to be shown in the tooltip, supplied by the renderer. |
415 string16 tooltip_text_; | 417 string16 tooltip_text_; |
416 | 418 |
417 // Factory used to safely scope delayed calls to ShutdownHost(). | 419 // Factory used to safely scope delayed calls to ShutdownHost(). |
418 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; | 420 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; |
419 | 421 |
420 // selected text on the renderer. | 422 // selected text on the renderer. |
421 std::string selected_text_; | 423 std::string selected_text_; |
422 | 424 |
423 gfx::PluginWindowHandle compositing_surface_; | |
424 | |
425 // List of pending swaps for deferred acking: | 425 // List of pending swaps for deferred acking: |
426 // pairs of (route_id, gpu_host_id). | 426 // pairs of (route_id, gpu_host_id). |
427 std::list<std::pair<int32, int32> > pending_swap_buffers_acks_; | 427 std::list<std::pair<int32, int32> > pending_swap_buffers_acks_; |
428 | 428 |
429 // The fullscreen window used for pepper flash. | 429 // The fullscreen window used for pepper flash. |
430 scoped_nsobject<NSWindow> pepper_fullscreen_window_; | 430 scoped_nsobject<NSWindow> pepper_fullscreen_window_; |
431 scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_; | 431 scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_; |
432 | 432 |
433 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); | 433 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); |
434 }; | 434 }; |
435 | 435 |
436 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 436 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ |
OLD | NEW |