Allow fullscreen manager and control container to be null

chrome/browser/android/compositor/layer/tab_layer.cc

 // 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 "chrome/browser/android/compositor/layer/tab_layer.h"
 
 #include "base/i18n/rtl.h"
 #include "cc/layers/image_layer.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_lists.h"
@@ skipping 128 matching lines @@
   shadow_y /= border_scale;
   shadow_width /= border_scale;
   shadow_height /= border_scale;
 
   //----------------------------------------------------------------------------
   // Precalculate Helper Values
   //----------------------------------------------------------------------------
   const gfx::RectF border_padding(border_resource->padding);
   const gfx::RectF shadow_padding(shadow_resource->padding);
   const gfx::RectF contour_padding(contour_resource->padding);
-  const gfx::RectF toolbar_padding(toolbar_resource->padding);
 
   // If we're in portrait and we're RTL, the close button is on the left.
   // Similarly if we're in landscape and we're in LTR, the close button is on
   // the left.
   const bool close_button_on_left = is_portrait == l10n_util::IsLayoutRtl();
   const bool back_visible = cos(rotation_x * SK_MScalarPI / 180.0f) < 0 ||
                             cos(rotation_y * SK_MScalarPI / 180.0f) < 0;
 
   const float content_scale = width / content_width;
   gfx::RectF content_area(0.f, 0.f, content_width, content_height);
   gfx::RectF scaled_local_content_area(shadow_x, shadow_y, shadow_width,
                                        shadow_height);
   gfx::RectF descaled_local_content_area(
       scaled_local_content_area.x() / content_scale,
       scaled_local_content_area.y() / content_scale,
       scaled_local_content_area.width() / content_scale,
       scaled_local_content_area.height() / content_scale);
 
   const gfx::Size shadow_padding_size(
       shadow_resource->size.width() - shadow_padding.width(),
       shadow_resource->size.height() - shadow_padding.height());
   const gfx::Size border_padding_size(
       border_resource->size.width() - border_padding.width(),
       border_resource->size.height() - border_padding.height());
   const gfx::Size contour_padding_size(
       contour_resource->size.width() - contour_padding.width(),
       contour_resource->size.height() - contour_padding.height());
 
-  gfx::Size toolbar_impact_size(toolbar_padding.size().width(),
-                                toolbar_padding.size().height());
-  if (!show_toolbar || back_visible)
-    toolbar_impact_size.SetSize(0, 0);
   const float close_btn_effective_width = close_btn_width * close_alpha;
 
-  //----------------------------------------------------------------------------
-  // Update Resource Ids For Layers That Impact Layout
-  //----------------------------------------------------------------------------
-  toolbar_layer_->PushResource(toolbar_resource,
-                               nullptr,
-                               anonymize_toolbar,
-                               incognito_,
-                               false);
+  float toolbar_impact_height = 0;
+  if (toolbar_resource) {
+    //--------------------------------------------------------------------------
+    // Update Resource Ids For Layers That Impact Layout
+    //--------------------------------------------------------------------------
+    toolbar_layer_->PushResource(toolbar_resource, nullptr, anonymize_toolbar,
+                                 incognito_, false);
+    if (show_toolbar && !back_visible)
+      toolbar_impact_height = toolbar_resource->padding.height();
+  }
 
   //----------------------------------------------------------------------------
   // Compute Alpha and Visibility
   //----------------------------------------------------------------------------
   border_alpha *= alpha;
   contour_alpha *= alpha;
   shadow_alpha *= alpha;
   close_alpha *= alpha;
   toolbar_alpha *= alpha;
 
@@ skipping 18 matching lines @@
   gfx::Size title_size(width - close_btn_effective_width, border_padding.y());
   gfx::Size back_logo_size;
   // TODO(clholgat): Figure out why the back logo is null sometimes.
   if (back_logo_resource)
     back_logo_size = back_logo_resource->size;
 
   // Store this size at a point as it might go negative during the inset
   // calculations.
   gfx::Point desired_content_size_pt(
       descaled_local_content_area.width(),
-      descaled_local_content_area.height() - toolbar_impact_size.height());
+      descaled_local_content_area.height() - toolbar_impact_height);
 
   // Shrink the toolbar layer so we properly clip if it's offset.
   gfx::Size toolbar_size(
       toolbar_layer_->layer()->bounds().width(),
       toolbar_layer_->layer()->bounds().height() - toolbar_y_offset);
 
   //----------------------------------------------------------------------------
   // Compute Layer Positions
   //----------------------------------------------------------------------------
   gfx::PointF shadow_position(-shadow_padding.x() * side_border_scale,
                               -shadow_padding.y());
   gfx::PointF border_position(-border_padding.x() * side_border_scale,
                               -border_padding.y());
   gfx::PointF contour_position(-contour_padding.x() * side_border_scale,
                                -contour_padding.y());
   gfx::PointF toolbar_position(
       0.f, toolbar_layer_->layer()->bounds().height() - toolbar_size.height());
-  gfx::PointF content_position(0.f, toolbar_impact_size.height());
+  gfx::PointF content_position(0.f, toolbar_impact_height);
   gfx::PointF back_logo_position(
       ((descaled_local_content_area.width() - back_logo_->bounds().width()) *
        content_scale) /
           2.0f,
       ((descaled_local_content_area.height() - back_logo_->bounds().height()) *
        content_scale) /
           2.0f);
   gfx::PointF close_button_position;
   gfx::PointF title_position;
 
@@ skipping 33 matching lines @@
 
     // Scaled eventually, so have to descale the size difference first.
     toolbar_position.set_y(toolbar_position.y() + inset_diff / content_scale);
     content_position.set_y(content_position.y() + inset_diff / content_scale);
     desired_content_size_pt.set_y(desired_content_size_pt.y() -
                                   inset_diff / content_scale);
   }
 
   const bool inset_toolbar = !inset_border;
   if (!inset_toolbar) {
-    float inset_diff = toolbar_impact_size.height();
+    float inset_diff = toolbar_impact_height;
     toolbar_position.set_y(toolbar_position.y() - inset_diff);
     content_position.set_y(content_position.y() - inset_diff);
     desired_content_size_pt.set_y(desired_content_size_pt.y() + inset_diff);
   }
 
   // Finally build the sizes that might have calculations that go negative.
   gfx::Size desired_content_size(desired_content_size_pt.x(),
                                  desired_content_size_pt.y());
 
   //----------------------------------------------------------------------------
@@ skipping 264 matching lines @@
       title_->AddChild(layer);
     }
   }
 
   if (title)
     title->SetUIResourceIds();
 }
 
 }  //  namespace android
 }  //  namespace chrome