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

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

Issue 392143002: Fix flipped views on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@rwhelper_monstrosity
Patch Set: Rebase Created 6 years, 5 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 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 404
405 // The associated Model. Can be NULL if Destroy() is called when 405 // The associated Model. Can be NULL if Destroy() is called when
406 // someone (other than superview) has retained |cocoa_view_|. 406 // someone (other than superview) has retained |cocoa_view_|.
407 RenderWidgetHostImpl* render_widget_host_; 407 RenderWidgetHostImpl* render_widget_host_;
408 408
409 // Current text input type. 409 // Current text input type.
410 ui::TextInputType text_input_type_; 410 ui::TextInputType text_input_type_;
411 bool can_compose_inline_; 411 bool can_compose_inline_;
412 412
413 // The background CoreAnimation layer which is hosted by |cocoa_view_|. 413 // The background CoreAnimation layer which is hosted by |cocoa_view_|.
414 // The compositing or software layers will be added as sublayers to this.
415 base::scoped_nsobject<CALayer> background_layer_; 414 base::scoped_nsobject<CALayer> background_layer_;
416 415
416 // A flipped layer, which acts as the parent of the compositing and software
417 // layers. This layer is flipped so that the we don't need to recompute the
418 // origin for sub-layers when their position changes (this is impossible when
419 // using remote layers, as their size change cannot be synchronized with the
420 // window). This indirection is needed because flipping hosted layers (like
421 // |background_layer_|) leads to unpredictable behavior.
422 base::scoped_nsobject<CALayer> flipped_layer_;
423
417 // The CoreAnimation layer hosted by the GPU process. 424 // The CoreAnimation layer hosted by the GPU process.
418 base::scoped_nsobject<CALayerHost> remote_layer_host_; 425 base::scoped_nsobject<CALayerHost> remote_layer_host_;
419 426
420 // The CoreAnimation layer for software compositing. This should be NULL 427 // The CoreAnimation layer for software compositing. This should be NULL
421 // when software compositing is not in use. 428 // when software compositing is not in use.
422 base::scoped_nsobject<SoftwareLayer> software_layer_; 429 base::scoped_nsobject<SoftwareLayer> software_layer_;
423 430
424 // Accelerated compositing structures. These may be dynamically created and 431 // Accelerated compositing structures. These may be dynamically created and
425 // destroyed together in Create/DestroyCompositedIOSurfaceAndLayer. 432 // destroyed together in Create/DestroyCompositedIOSurfaceAndLayer.
426 base::scoped_nsobject<CompositingIOSurfaceLayer> compositing_iosurface_layer_; 433 base::scoped_nsobject<CompositingIOSurfaceLayer> compositing_iosurface_layer_;
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_; 617 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
611 618
612 base::WeakPtrFactory<RenderWidgetHostViewMac> 619 base::WeakPtrFactory<RenderWidgetHostViewMac>
613 software_frame_weak_ptr_factory_; 620 software_frame_weak_ptr_factory_;
614 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 621 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
615 }; 622 };
616 623
617 } // namespace content 624 } // namespace content
618 625
619 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 626 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698