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 | 7 |
8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
9 #include <list> | 9 #include <list> |
10 #include <map> | 10 #include <map> |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "content/browser/renderer_host/display_link_mac.h" | 22 #include "content/browser/renderer_host/display_link_mac.h" |
23 #include "content/browser/renderer_host/render_widget_host_view_base.h" | 23 #include "content/browser/renderer_host/render_widget_host_view_base.h" |
24 #include "content/browser/renderer_host/software_frame_manager.h" | 24 #include "content/browser/renderer_host/software_frame_manager.h" |
25 #include "content/common/content_export.h" | 25 #include "content/common/content_export.h" |
26 #include "content/common/cursors/webcursor.h" | 26 #include "content/common/cursors/webcursor.h" |
27 #include "content/common/edit_command.h" | 27 #include "content/common/edit_command.h" |
28 #import "content/public/browser/render_widget_host_view_mac_base.h" | 28 #import "content/public/browser/render_widget_host_view_mac_base.h" |
29 #include "ipc/ipc_sender.h" | 29 #include "ipc/ipc_sender.h" |
30 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" | 30 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" |
31 #include "ui/base/cocoa/base_view.h" | 31 #include "ui/base/cocoa/base_view.h" |
| 32 #include "ui/base/cocoa/remote_layer_api.h" |
32 | 33 |
33 struct ViewHostMsg_TextInputState_Params; | 34 struct ViewHostMsg_TextInputState_Params; |
34 | 35 |
35 namespace content { | 36 namespace content { |
36 class CompositingIOSurfaceMac; | 37 class CompositingIOSurfaceMac; |
37 class CompositingIOSurfaceContext; | 38 class CompositingIOSurfaceContext; |
38 class RenderWidgetHostViewMac; | 39 class RenderWidgetHostViewMac; |
39 class RenderWidgetHostViewMacEditCommandHelper; | 40 class RenderWidgetHostViewMacEditCommandHelper; |
40 class WebContents; | 41 class WebContents; |
41 } | 42 } |
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
422 // The CoreAnimation layer for software compositing. This should be NULL | 423 // The CoreAnimation layer for software compositing. This should be NULL |
423 // when software compositing is not in use. | 424 // when software compositing is not in use. |
424 base::scoped_nsobject<SoftwareLayer> software_layer_; | 425 base::scoped_nsobject<SoftwareLayer> software_layer_; |
425 | 426 |
426 // Accelerated compositing structures. These may be dynamically created and | 427 // Accelerated compositing structures. These may be dynamically created and |
427 // destroyed together in Create/DestroyCompositedIOSurfaceAndLayer. | 428 // destroyed together in Create/DestroyCompositedIOSurfaceAndLayer. |
428 base::scoped_nsobject<CompositingIOSurfaceLayer> compositing_iosurface_layer_; | 429 base::scoped_nsobject<CompositingIOSurfaceLayer> compositing_iosurface_layer_; |
429 scoped_refptr<CompositingIOSurfaceMac> compositing_iosurface_; | 430 scoped_refptr<CompositingIOSurfaceMac> compositing_iosurface_; |
430 scoped_refptr<CompositingIOSurfaceContext> compositing_iosurface_context_; | 431 scoped_refptr<CompositingIOSurfaceContext> compositing_iosurface_context_; |
431 | 432 |
| 433 CAContextID remote_context_id_; |
| 434 base::scoped_nsobject<CALayerHost> remote_layer_host_; |
| 435 |
432 // Delegated frame management and compositior. | 436 // Delegated frame management and compositior. |
433 base::scoped_nsobject<BrowserCompositorViewMac> browser_compositor_view_; | 437 base::scoped_nsobject<BrowserCompositorViewMac> browser_compositor_view_; |
434 scoped_ptr<DelegatedFrameHost> delegated_frame_host_; | 438 scoped_ptr<DelegatedFrameHost> delegated_frame_host_; |
435 scoped_ptr<ui::Layer> root_layer_; | 439 scoped_ptr<ui::Layer> root_layer_; |
436 | 440 |
437 // This holds the current software compositing framebuffer, if any. | 441 // This holds the current software compositing framebuffer, if any. |
438 scoped_ptr<SoftwareFrameManager> software_frame_manager_; | 442 scoped_ptr<SoftwareFrameManager> software_frame_manager_; |
439 | 443 |
440 // Latency info to send back when the next frame appears on the | 444 // Latency info to send back when the next frame appears on the |
441 // screen. | 445 // screen. |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
614 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_; | 618 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_; |
615 | 619 |
616 base::WeakPtrFactory<RenderWidgetHostViewMac> | 620 base::WeakPtrFactory<RenderWidgetHostViewMac> |
617 software_frame_weak_ptr_factory_; | 621 software_frame_weak_ptr_factory_; |
618 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); | 622 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); |
619 }; | 623 }; |
620 | 624 |
621 } // namespace content | 625 } // namespace content |
622 | 626 |
623 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 627 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ |
OLD | NEW |