Mac: Flip fullscreen low power layer geometry

ui/accelerated_widget_mac/accelerated_widget_mac.mm

 // Copyright 2014 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 "ui/accelerated_widget_mac/accelerated_widget_mac.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/mac/mac_util.h"
@@ skipping 30 matching lines @@
 
   // 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_ setAnchorPoint:CGPointMake(0, 0)];
   [flipped_layer_
       setAutoresizingMask:kCALayerWidthSizable|kCALayerHeightSizable];
 
+  fslp_flipped_layer_.reset([[CALayer alloc] init]);
+  [fslp_flipped_layer_ setGeometryFlipped:YES];
+  [fslp_flipped_layer_ setAnchorPoint:CGPointMake(0, 0)];
+  [fslp_flipped_layer_
+      setAutoresizingMask:kCALayerWidthSizable|kCALayerHeightSizable];
+
   // Use a sequence number as the accelerated widget handle that we can use
   // to look up the internals structure.
   static intptr_t last_sequence_number = 0;
   last_sequence_number += 1;
   native_widget_ = reinterpret_cast<gfx::AcceleratedWidget>(
       last_sequence_number);
   g_widget_to_helper_map.Pointer()->insert(
       std::make_pair(native_widget_, this));
 }
 
 AcceleratedWidgetMac::~AcceleratedWidgetMac() {
   DCHECK(!view_);
   g_widget_to_helper_map.Pointer()->erase(native_widget_);
 }
 
 void AcceleratedWidgetMac::SetNSView(AcceleratedWidgetMacNSView* view) {
   // Disable the fade-in animation as the view is added.
   ScopedCAActionDisabler disabler;
 
   DCHECK(!fslp_coordinator_);
   DCHECK(view && !view_);
   view_ = view;
 
   CALayer* background_layer = [view_->AcceleratedWidgetGetNSView() layer];
   DCHECK(background_layer);
   [flipped_layer_ setBounds:[background_layer bounds]];
+  [fslp_flipped_layer_ setBounds:[background_layer bounds]];
   [background_layer addSublayer:flipped_layer_];
 }
 
 void AcceleratedWidgetMac::ResetNSView() {
   if (!view_)
     return;
 
   if (fslp_coordinator_) {
     fslp_coordinator_->WillLoseAcceleratedWidget();
     DCHECK(!fslp_coordinator_);
@@ skipping 18 matching lines @@
   DCHECK(!fslp_coordinator_);
   fslp_coordinator_ = coordinator;
 }
 
 void AcceleratedWidgetMac::ResetFullscreenLowPowerCoordinator() {
   DCHECK(fslp_coordinator_);
   fslp_coordinator_ = nullptr;
 }
 
 CALayer* AcceleratedWidgetMac::GetFullscreenLowPowerLayer() const {
-  return fullscreen_low_power_layer_;
+  return fslp_flipped_layer_;
 }
 
 bool AcceleratedWidgetMac::MightBeInFullscreenLowPowerMode() const {
   return fslp_coordinator_;
 }
 
 bool AcceleratedWidgetMac::HasFrameOfSize(
     const gfx::Size& dip_size) const {
   return last_swap_size_dip_ == dip_size;
 }
@@ skipping 25 matching lines @@
     base::scoped_nsobject<CALayer> fullscreen_low_power_layer,
     const gfx::Size& pixel_size,
     float scale_factor) {
   TRACE_EVENT0("ui", "AcceleratedWidgetMac::GotCAContextFrame");
   if (!view_) {
     TRACE_EVENT0("ui", "No associated NSView");
     return;
   }
   ScopedCAActionDisabler disabler;
   last_swap_size_dip_ = gfx::ConvertSizeToDIP(scale_factor, pixel_size);
+  if (fullscreen_low_power_layer_valid)
+    [fslp_flipped_layer_ setFrame:gfx::Rect(last_swap_size_dip_).ToCGRect()];
 
   // Ensure that the content is in the CALayer hierarchy, and update fullscreen
   // low power state.
   if (content_layer_ != content_layer) {
     [flipped_layer_ addSublayer:content_layer];
     [content_layer_ removeFromSuperlayer];
     content_layer_ = content_layer;
   }
   if (fullscreen_low_power_layer_ != fullscreen_low_power_layer) {
     if (fslp_coordinator_) {
       fslp_coordinator_->WillLoseAcceleratedWidget();
       DCHECK(!fslp_coordinator_);
     }
+    [fslp_flipped_layer_ addSublayer:fullscreen_low_power_layer];
+    [fullscreen_low_power_layer_ removeFromSuperlayer];
     fullscreen_low_power_layer_ = fullscreen_low_power_layer;
   }
   if (fslp_coordinator_)
     fslp_coordinator_->SetLowPowerLayerValid(fullscreen_low_power_layer_valid);
 
   // Ensure the IOSurface is removed.
   if (io_surface_layer_) {
     [io_surface_layer_ removeFromSuperlayer];
     io_surface_layer_.reset();
   }
@@ skipping 31 matching lines @@
 
   // Ensure that the content layer is removed.
   if (content_layer_) {
     [content_layer_ removeFromSuperlayer];
     content_layer_.reset();
   }
   view_->AcceleratedWidgetSwapCompleted();
 }
 
 }  // namespace ui