Revert of Fix text clipping in CompositorFrameTime Display

cc/layers/heads_up_display_layer_impl.cc

 // Copyright 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 "cc/layers/heads_up_display_layer_impl.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/strings/stringprintf.h"
@@ skipping 279 matching lines @@
   }
 
   if (debug_state.show_fps_counter || debug_state.continuous_painting) {
     area = DrawGpuRasterizationStatus(canvas, 0, area.bottom(),
                                       SkMaxScalar(area.width(), 150));
   }
 
   if (debug_state.ShowMemoryStats())
     DrawMemoryDisplay(canvas, 0, area.bottom(), SkMaxScalar(area.width(), 150));
 }
-int HeadsUpDisplayLayerImpl::MeasureText(SkPaint* paint,
-                                         const std::string& text,
-                                         int size) const {
-  const bool anti_alias = paint->isAntiAlias();
-  paint->setAntiAlias(true);
-  paint->setTextSize(size);
-  paint->setTypeface(typeface_.get());
-  SkScalar text_width = paint->measureText(text.c_str(), text.length());
 
-  paint->setAntiAlias(anti_alias);
-  return SkScalarCeilToInt(text_width);
-}
 void HeadsUpDisplayLayerImpl::DrawText(SkCanvas* canvas,
                                        SkPaint* paint,
                                        const std::string& text,
                                        SkPaint::Align align,
                                        int size,
                                        int x,
                                        int y) const {
   const bool anti_alias = paint->isAntiAlias();
   paint->setAntiAlias(true);
 
@@ skipping 294 matching lines @@
     SkCanvas* canvas,
     const PaintTimeCounter* paint_time_counter,
     int right,
     int top) const {
   const int kPadding = 4;
   const int kFontHeight = 14;
 
   const int kGraphWidth = paint_time_counter->HistorySize();
   const int kGraphHeight = 40;
 
-  SkPaint paint = CreatePaint();
-
-  const std::string title = "Compositor frame time (ms)";
-  int title_text_width = MeasureText(&paint, title, kFontHeight);
-  int contents_width = std::max(title_text_width, kGraphWidth);
-
-  const int width = contents_width + 2 * kPadding;
+  const int width = kGraphWidth + 2 * kPadding;
   const int height =
       kFontHeight + kGraphHeight + 4 * kPadding + 2 + kFontHeight + kPadding;
   const int left = bounds().width() - width - right;
 
   const SkRect area = SkRect::MakeXYWH(left, top, width, height);
 
+  SkPaint paint = CreatePaint();
   DrawGraphBackground(canvas, &paint, area);
 
-  SkRect text_bounds = SkRect::MakeXYWH(left + kPadding, top + kPadding,
-                                        contents_width, kFontHeight);
-  SkRect text_bounds2 =
-      SkRect::MakeXYWH(left + kPadding, text_bounds.bottom() + kPadding,
-                       contents_width, kFontHeight);
-  SkRect graph_bounds = SkRect::MakeXYWH(left + (width - kGraphWidth) / 2,
+  SkRect text_bounds = SkRect::MakeXYWH(
+      left + kPadding, top + kPadding, kGraphWidth, kFontHeight);
+  SkRect text_bounds2 = SkRect::MakeXYWH(left + kPadding,
+                                         text_bounds.bottom() + kPadding,
+                                         kGraphWidth,
+                                         kFontHeight);
+  SkRect graph_bounds = SkRect::MakeXYWH(left + kPadding,
                                          text_bounds2.bottom() + 2 * kPadding,
-                                         kGraphWidth, kGraphHeight);
+                                         kGraphWidth,
+                                         kGraphHeight);
 
   const std::string value_text =
       base::StringPrintf("%.1f", paint_time_graph_.value);
   const std::string min_max_text = base::StringPrintf(
       "%.1f-%.1f", paint_time_graph_.min, paint_time_graph_.max);
 
   paint.setColor(DebugColors::PaintTimeDisplayTextAndGraphColor());
-  DrawText(canvas, &paint, title, SkPaint::kLeft_Align, kFontHeight,
-           text_bounds.left(), text_bounds.bottom());
+  DrawText(canvas, &paint, "Compositor frame time(ms)", SkPaint::kLeft_Align,
+           kFontHeight, text_bounds.left(), text_bounds.bottom());
   DrawText(canvas,
            &paint,
            value_text,
            SkPaint::kLeft_Align,
            kFontHeight,
            text_bounds2.left(),
            text_bounds2.bottom());
   DrawText(canvas,
            &paint,
            min_max_text,
@@ skipping 188 matching lines @@
   return "cc::HeadsUpDisplayLayerImpl";
 }
 
 void HeadsUpDisplayLayerImpl::AsValueInto(
     base::trace_event::TracedValue* dict) const {
   LayerImpl::AsValueInto(dict);
   dict->SetString("layer_name", "Heads Up Display Layer");
 }
 
 }  // namespace cc