[TTS] Fix Bar text showing blank after startup.

chrome/browser/android/compositor/layer/contextual_search_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/contextual_search_layer.h"
 
 #include "cc/layers/layer.h"
 #include "cc/layers/nine_patch_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/ui_resource_layer.h"
@@ skipping 223 matching lines @@
     }
   } else {
     // Peek Promo Container
     if (peek_promo_container_.get() && peek_promo_container_->parent())
       peek_promo_container_->RemoveFromParent();
   }
 
   // ---------------------------------------------------------------------------
   // Search Term, Context and Search Caption
   // ---------------------------------------------------------------------------
-  SetupTextLayer(
-      search_bar_top,
-      search_bar_height,
-      search_text_layer_min_height,
-      search_caption_resource_id,
-      search_caption_visible,
-      search_caption_animation_percentage,
-      search_context_resource_id,
-      search_context_opacity,
-      search_term_caption_spacing);
+  SetupTextLayer(search_bar_top, search_bar_height,

[mdjones, 2016/11/22 16:37:49]

Unless there was a reason not to, could we leave this as the expanded version?
It's easier to read.

[Donn Denman, 2016/11/28 17:58:28]

Done.  I agree with you, but git CL format liked this better for some reason.

+                 search_text_layer_min_height, search_caption_resource_id,
+                 search_caption_visible, search_caption_animation_percentage,
+                 search_term_opacity, search_context_resource_id,
+                 search_context_opacity, search_term_caption_spacing);
 
   // ---------------------------------------------------------------------------
   // Arrow Icon
   // ---------------------------------------------------------------------------
   // Grabs the arrow icon resource.
   ui::ResourceManager::Resource* arrow_icon_resource =
       resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
                                      arrow_up_resource_id);
 
   // Positions the icon at the end of the bar.
@@ skipping 262 matching lines @@
   // have a top margin that needs to be accounted for while running the
   // animation. The final |static_image_y_offset| should be equal to
   // |tpp_margin|.
   float static_image_y_offset =
       (static_image_size_ * (1.f - visibility_percentage))
       + top_margin;
   static_image_layer->SetPosition(
       gfx::PointF(side_margin, static_image_y_offset));
 }
 
-void ContextualSearchLayer::SetupTextLayer(
-    float bar_top,
-    float bar_height,
-    float search_text_layer_min_height,
-    int caption_resource_id,
-    bool caption_visible,
-    float animation_percentage,
-    int context_resource_id,
-    float context_opacity,
-    float term_caption_spacing) {
+void ContextualSearchLayer::SetupTextLayer(float bar_top,
+                                           float bar_height,
+                                           float search_text_layer_min_height,
+                                           int caption_resource_id,
+                                           bool caption_visible,
+                                           float animation_percentage,
+                                           float search_term_opacity,
+                                           int context_resource_id,
+                                           float context_opacity,
+                                           float term_caption_spacing) {
   // ---------------------------------------------------------------------------
   // Setup the Drawing Hierarchy
   // ---------------------------------------------------------------------------
   // Search Term
-  if (bar_text_->parent() != text_layer_)
+  bool has_bar_text = search_term_opacity > 0.0f;
+  if (has_bar_text && bar_text_->parent() != text_layer_)
     text_layer_->AddChild(bar_text_);
 
   // Search Context
   ui::ResourceManager::Resource* context_resource =
       resource_manager_->GetResource(
           ui::ANDROID_RESOURCE_TYPE_DYNAMIC, context_resource_id);
   if (context_resource) {
     search_context_->SetUIResourceId(context_resource->ui_resource->id());
     search_context_->SetBounds(context_resource->size);
   }
@@ skipping 19 matching lines @@
   }
 
   // ---------------------------------------------------------------------------
   // Calculate Text Layer Size
   // ---------------------------------------------------------------------------
   // If space allows, the Term, Context and Caption should occupy a Text
   // section of fixed size.
   // We may not be able to fit these inside the ideal size as the user may have
   // their Font Size set to large.
 
+  // The Term might not be visible or initialized yet, so set up main_text with
+  // whichever main bar text seems appropriate.
+  scoped_refptr<cc::UIResourceLayer> main_text =
+      (has_bar_text ? bar_text_ : search_context_);
+
   // The search_caption_ may not have had it's resource set by this point, if so
   // the bounds will be zero and everything will still work.
-  float term_height = bar_text_->bounds().height();
+  float term_height = main_text->bounds().height();
   float caption_height = search_caption_->bounds().height();
 
   float layer_height = std::max(search_text_layer_min_height,
       term_height + caption_height + term_caption_spacing);
-  float layer_width = std::max(bar_text_->bounds().width(),
-                                 search_caption_->bounds().width());
+  float layer_width =
+      std::max(main_text->bounds().width(), search_caption_->bounds().width());
 
   float layer_top = bar_top + (bar_height - layer_height) / 2;
   text_layer_->SetBounds(gfx::Size(layer_width, layer_height));
   text_layer_->SetPosition(gfx::PointF(0.f, layer_top));
   text_layer_->SetMasksToBounds(true);
 
   // ---------------------------------------------------------------------------
   // Layout Text Layer
   // ---------------------------------------------------------------------------
   // ---Top of Search Bar--- <- bar_top
   //
   // ---Top of Text Layer--- <- layer_top
   //                         } remaining_height / 2
   // Term & Context          } term_height
   //                         } term_caption_spacing
   // Caption                 } caption_height
   //                         } remaining_height / 2
   // --Bottom of Text Layer-
   //
   // --Bottom of Search Bar-
   // If the Caption is not visible the Term is centered in this space, when
   // the Caption becomes visible it is animated sliding up into it's position
   // with the spacings determined by UI.
   // The Term and the Context are assumed to be the same height and will be
   // positioned one on top of the other. When the Context is resolved it will
   // fade out and the Term will fade in.
 
   search_context_->SetOpacity(context_opacity);
-  bar_text_->SetOpacity(1.f - context_opacity);
+  if (has_bar_text)

[mdjones, 2016/11/22 16:37:49]

The bar_text_ object always exists since it is created in the constructor. Do
these "if (has_bar_text_)" checks have any visible impact?

[Donn Denman, 2016/11/28 17:58:28]

You're right, the checks earlier are the only ones that are needed.  Renamed to
bar_text_visible, and removed the check here and the ones below.

+    bar_text_->SetOpacity(1.f - context_opacity);
 
   // If there is no caption, just vertically center the Search Term.
   float term_top = (layer_height - term_height) / 2;
 
   // If we aren't displaying the caption we're done.
   if (!caption_visible || animation_percentage == 0.f || !caption_resource) {
-    bar_text_->SetPosition(gfx::PointF(0.f, term_top));
+    if (has_bar_text)
+      bar_text_->SetPosition(gfx::PointF(0.f, term_top));
     search_context_->SetPosition(gfx::PointF(0.f, term_top));
     return;
   }
 
   // Calculate the positions for the Term and Caption when the Caption
   // animation is complete.
   float remaining_height = layer_height
                          - term_height
                          - term_caption_spacing
                          - caption_height;
 
   float term_top_end = remaining_height / 2;
   float caption_top_end = term_top_end + term_height + term_caption_spacing;
 
   // Interpolate between the animation start and end positions (short cut
   // if the animation is at the end or start).
   term_top = term_top * (1.f - animation_percentage)
            + term_top_end * animation_percentage;
 
   // The Caption starts off the bottom of the Text Layer.
   float caption_top = layer_height * (1.f - animation_percentage)
                     + caption_top_end * animation_percentage;
 
-  bar_text_->SetPosition(gfx::PointF(0.f, term_top));
+  if (has_bar_text)
+    bar_text_->SetPosition(gfx::PointF(0.f, term_top));
   search_context_->SetPosition(gfx::PointF(0.f, term_top));
   search_caption_->SetPosition(gfx::PointF(0.f, caption_top));
 }
 
 void ContextualSearchLayer::SetThumbnail(const SkBitmap* thumbnail) {
   // Determine the scaled thumbnail width and height. If both the height and
   // width of |thumbnail| are larger than |static_image_size_|, the thumbnail
   // will be scaled down by a call to Layer::SetBounds() below.
   int min_dimension = std::min(thumbnail->width(), thumbnail->height());
   int scaled_thumbnail_width = thumbnail->width();
@@ skipping 142 matching lines @@
 
   // Touch Highlight Layer
   touch_highlight_layer_->SetIsDrawable(true);
   touch_highlight_layer_->SetBackgroundColor(kTouchHighlightColor);
 }
 
 ContextualSearchLayer::~ContextualSearchLayer() {
 }
 
 }  //  namespace android