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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_mac.h

Issue 347653005: Make cross-process CALayers work on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@image_transport_1
Patch Set: Incorporate review feedback Created 6 years, 6 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
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 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 <IOSurface/IOSurfaceAPI.h> 9 #include <IOSurface/IOSurfaceAPI.h>
10 #include <list> 10 #include <list>
(...skipping 12 matching lines...) Expand all
23 #include "content/browser/renderer_host/display_link_mac.h" 23 #include "content/browser/renderer_host/display_link_mac.h"
24 #include "content/browser/renderer_host/render_widget_host_view_base.h" 24 #include "content/browser/renderer_host/render_widget_host_view_base.h"
25 #include "content/browser/renderer_host/software_frame_manager.h" 25 #include "content/browser/renderer_host/software_frame_manager.h"
26 #include "content/common/content_export.h" 26 #include "content/common/content_export.h"
27 #include "content/common/cursors/webcursor.h" 27 #include "content/common/cursors/webcursor.h"
28 #include "content/common/edit_command.h" 28 #include "content/common/edit_command.h"
29 #import "content/public/browser/render_widget_host_view_mac_base.h" 29 #import "content/public/browser/render_widget_host_view_mac_base.h"
30 #include "ipc/ipc_sender.h" 30 #include "ipc/ipc_sender.h"
31 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" 31 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
32 #include "ui/base/cocoa/base_view.h" 32 #include "ui/base/cocoa/base_view.h"
33 #include "ui/base/cocoa/remote_layer_api.h"
33 34
34 struct ViewHostMsg_TextInputState_Params; 35 struct ViewHostMsg_TextInputState_Params;
35 36
36 namespace content { 37 namespace content {
37 class CompositingIOSurfaceMac; 38 class CompositingIOSurfaceMac;
38 class CompositingIOSurfaceContext; 39 class CompositingIOSurfaceContext;
39 class RenderWidgetHostViewMac; 40 class RenderWidgetHostViewMac;
40 class RenderWidgetHostViewMacEditCommandHelper; 41 class RenderWidgetHostViewMacEditCommandHelper;
41 class WebContents; 42 class WebContents;
42 } 43 }
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 RenderWidgetHostImpl* render_widget_host_; 414 RenderWidgetHostImpl* render_widget_host_;
414 415
415 // Current text input type. 416 // Current text input type.
416 ui::TextInputType text_input_type_; 417 ui::TextInputType text_input_type_;
417 bool can_compose_inline_; 418 bool can_compose_inline_;
418 419
419 // The background CoreAnimation layer which is hosted by |cocoa_view_|. 420 // The background CoreAnimation layer which is hosted by |cocoa_view_|.
420 // The compositing or software layers will be added as sublayers to this. 421 // The compositing or software layers will be added as sublayers to this.
421 base::scoped_nsobject<CALayer> background_layer_; 422 base::scoped_nsobject<CALayer> background_layer_;
422 423
424 // The CoreAnimation layer hosted by the GPU process.
425 base::scoped_nsobject<CALayerHost> remote_layer_host_;
426
423 // The CoreAnimation layer for software compositing. This should be NULL 427 // The CoreAnimation layer for software compositing. This should be NULL
424 // when software compositing is not in use. 428 // when software compositing is not in use.
425 base::scoped_nsobject<SoftwareLayer> software_layer_; 429 base::scoped_nsobject<SoftwareLayer> software_layer_;
426 430
427 // Accelerated compositing structures. These may be dynamically created and 431 // Accelerated compositing structures. These may be dynamically created and
428 // destroyed together in Create/DestroyCompositedIOSurfaceAndLayer. 432 // destroyed together in Create/DestroyCompositedIOSurfaceAndLayer.
429 base::scoped_nsobject<CompositingIOSurfaceLayer> compositing_iosurface_layer_; 433 base::scoped_nsobject<CompositingIOSurfaceLayer> compositing_iosurface_layer_;
430 scoped_refptr<CompositingIOSurfaceMac> compositing_iosurface_; 434 scoped_refptr<CompositingIOSurfaceMac> compositing_iosurface_;
431 scoped_refptr<CompositingIOSurfaceContext> compositing_iosurface_context_; 435 scoped_refptr<CompositingIOSurfaceContext> compositing_iosurface_context_;
432 436
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_; 619 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
616 620
617 base::WeakPtrFactory<RenderWidgetHostViewMac> 621 base::WeakPtrFactory<RenderWidgetHostViewMac>
618 software_frame_weak_ptr_factory_; 622 software_frame_weak_ptr_factory_;
619 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 623 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
620 }; 624 };
621 625
622 } // namespace content 626 } // namespace content
623 627
624 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 628 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698