Fix flipped views on Mac

content/browser/renderer_host/render_widget_host_view_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
 
 #import <objc/runtime.h>
 #include <OpenGL/gl.h>
 #include <QuartzCore/QuartzCore.h>
 
@@ skipping 495 matching lines @@
       fullscreen_parent_host_view_(NULL),
       software_frame_weak_ptr_factory_(this) {
   software_frame_manager_.reset(new SoftwareFrameManager(
       software_frame_weak_ptr_factory_.GetWeakPtr()));
   // |cocoa_view_| owns us and we will be deleted when |cocoa_view_|
   // goes away.  Since we autorelease it, our caller must put
   // |GetNativeView()| into the view hierarchy right after calling us.
   cocoa_view_ = [[[RenderWidgetHostViewCocoa alloc]
                   initWithRenderWidgetHostViewMac:this] autorelease];
 
+  // Make this view host a solid white layer when there is no content ready to
+  // draw.
   background_layer_.reset([[CALayer alloc] init]);
   [background_layer_
       setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
-  [background_layer_ setGeometryFlipped:YES];
-  [background_layer_ setContentsGravity:kCAGravityTopLeft];
   [cocoa_view_ setLayer:background_layer_];
   [cocoa_view_ setWantsLayer:YES];
 
+  if (!IsDelegatedRendererEnabled()) {
+    // Add a flipped transparent layer as a child, so that we don't need to
+    // fiddle with the position of sub-layers -- they will always be at the
+    // origin.
+    flipped_layer_.reset([[CALayer alloc] init]);
+    [flipped_layer_ setGeometryFlipped:YES];
+    [flipped_layer_
+        setAutoresizingMask:kCALayerWidthSizable|kCALayerHeightSizable];
+    [background_layer_ addSublayer:flipped_layer_];
+  }
+
   if (IsDelegatedRendererEnabled()) {
     root_layer_.reset(new ui::Layer(ui::LAYER_TEXTURED));
     delegated_frame_host_.reset(new DelegatedFrameHost(this));
   }
 
   render_widget_host_->SetView(this);
 }
 
 RenderWidgetHostViewMac::~RenderWidgetHostViewMac() {
   // This is being called from |cocoa_view_|'s destructor, so invalidate the
@@ skipping 112 matching lines @@
 void RenderWidgetHostViewMac::EnsureSoftwareLayer() {
   TRACE_EVENT0("browser", "RenderWidgetHostViewMac::EnsureSoftwareLayer");
   if (software_layer_)
     return;
 
   software_layer_.reset([[SoftwareLayer alloc] init]);
   DCHECK(software_layer_);
 
   // Disable the fade-in animation as the layer is added.
   ScopedCAActionDisabler disabler;
-  [background_layer_ addSublayer:software_layer_];
+  [flipped_layer_ addSublayer:software_layer_];
 }
 
 void RenderWidgetHostViewMac::DestroySoftwareLayer() {
   if (!software_layer_)
     return;
 
   // Disable the fade-out animation as the layer is removed.
   ScopedCAActionDisabler disabler;
   [software_layer_ removeFromSuperlayer];
   software_layer_.reset();
 }
 
 void RenderWidgetHostViewMac::EnsureCompositedIOSurfaceLayer() {
   TRACE_EVENT0("browser",
                "RenderWidgetHostViewMac::EnsureCompositedIOSurfaceLayer");
   DCHECK(compositing_iosurface_context_);
   if (compositing_iosurface_layer_)
     return;
 
   compositing_iosurface_layer_.reset([[CompositingIOSurfaceLayer alloc]
       initWithIOSurface:compositing_iosurface_
         withScaleFactor:compositing_iosurface_->scale_factor()
              withClient:this]);
   DCHECK(compositing_iosurface_layer_);
 
   // Disable the fade-in animation as the layer is added.
   ScopedCAActionDisabler disabler;
-  [background_layer_ addSublayer:compositing_iosurface_layer_];
+  [flipped_layer_ addSublayer:compositing_iosurface_layer_];
 }
 
 void RenderWidgetHostViewMac::DestroyCompositedIOSurfaceLayer(
     DestroyCompositedIOSurfaceLayerBehavior destroy_layer_behavior) {
   if (!compositing_iosurface_layer_)
     return;
 
   if (destroy_layer_behavior == kRemoveLayerFromHierarchy) {
     // Disable the fade-out animation as the layer is removed.
     ScopedCAActionDisabler disabler;
@@ skipping 1052 matching lines @@
 
       // If if the layer has changed put the new layer in the hierarchy and
       // take the old one out.
       if ([remote_layer_host_ contextId] != context_id) {
         [remote_layer_host_ removeFromSuperlayer];
 
         remote_layer_host_.reset([[CALayerHost alloc] init]);
         [remote_layer_host_ setContextId:context_id];
         [remote_layer_host_
             setAutoresizingMask:kCALayerMaxXMargin|kCALayerMaxYMargin];
-        [background_layer_ addSublayer:remote_layer_host_];
+        [flipped_layer_ addSublayer:remote_layer_host_];
       }
 
       // Ack the frame immediately. Any GPU back pressure will be applied by
       // the remote layer from within the GPU process.
       SendPendingSwapAck();
     } break;
     default:
       LOG(ERROR) << "Invalid surface handle type.";
       break;
   }
@@ skipping 417 matching lines @@
                                                  ack_params);
   pending_swap_ack_.reset();
 }
 
 void RenderWidgetHostViewMac::PauseForPendingResizeOrRepaintsAndDraw() {
   if (!render_widget_host_ || render_widget_host_->is_hidden())
     return;
 
   // Synchronized resizing does not yet work with browser compositor.
   // http://crbug.com/388005
-  if (delegated_frame_host_)
+  if (IsDelegatedRendererEnabled())
     return;
 
   // Pausing for one view prevents others from receiving frames.
   // This may lead to large delays, causing overlaps. See crbug.com/352020.
   if (!allow_pause_for_resize_or_repaint_)
     return;
 
   // Ensure that all frames are acked before waiting for a frame to come in.
   // Note that we will draw a frame at the end of this function, so it is safe
   // to ack a never-drawn frame here.
@@ skipping 1765 matching lines @@
 
 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding
 // regions that are not draggable. (See ControlRegionView in
 // native_app_window_cocoa.mm). This requires the render host view to be
 // draggable by default.
 - (BOOL)mouseDownCanMoveWindow {
   return YES;
 }
 
 @end