Mus Demo: Add square size parameter to the WindowTreeData constructor

services/ui/demo/mus_demo.cc

 // Copyright 2016 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 "services/ui/demo/mus_demo.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service_context.h"
@@ skipping 22 matching lines @@
 
 // Milliseconds between frames.
 const int64_t kFrameDelay = 33;
 
 // Size of square in pixels to draw.
 const int kSquareSize = 300;
 
 const SkColor kBgColor = SK_ColorRED;
 const SkColor kFgColor = SK_ColorYELLOW;
 
-void DrawSquare(const gfx::Rect& bounds, double angle, SkCanvas* canvas) {
+void DrawSquare(const gfx::Rect& bounds,
+                double angle,
+                SkCanvas* canvas,
+                int size) {
   // Create SkRect to draw centered inside the bounds.
   gfx::Point top_left = bounds.CenterPoint();
-  top_left.Offset(-kSquareSize / 2, -kSquareSize / 2);
-  SkRect rect =
-      SkRect::MakeXYWH(top_left.x(), top_left.y(), kSquareSize, kSquareSize);
+  top_left.Offset(-size / 2, -size / 2);
+  SkRect rect = SkRect::MakeXYWH(top_left.x(), top_left.y(), size, size);
 
   // Set SkPaint to fill solid color.
   SkPaint paint;
   paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(kFgColor);
 
   // Rotate the canvas.
   const gfx::Size canvas_size = bounds.size();
   if (angle != 0.0) {
     canvas->translate(SkFloatToScalar(canvas_size.width() * 0.5f),
                       SkFloatToScalar(canvas_size.height() * 0.5f));
     canvas->rotate(angle);
     canvas->translate(-SkFloatToScalar(canvas_size.width() * 0.5f),
                       -SkFloatToScalar(canvas_size.height() * 0.5f));
   }
 
   canvas->drawRect(rect, paint);
 }
 
 }  // namespace
 
 class MusDemo::WindowTreeData {
  public:
   explicit WindowTreeData(
-      std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
+      std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
+      int square_size)
+      : square_size_(square_size) {
     Init(std::move(window_tree_host));
   }
 
  private:
   // Initializes the window tree host and start drawing frames.
   void Init(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host);
 
   // Draws one frame, incrementing the rotation angle.
   void DrawFrame();
 
   // Helper function to retrieve the window to which we draw the bitmap.
   aura::Window* bitmap_window() {
     DCHECK(!window_tree_host_->window()->children().empty());
     return window_tree_host_->window()->children()[0];
   }
 
   // The Window tree host corresponding to this data.
   std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_;
 
   // Destroys itself when the window gets destroyed.
   aura_extra::ImageWindowDelegate* window_delegate_ = nullptr;
 
   // Timer for calling DrawFrame().
   base::RepeatingTimer timer_;
 
   // Current rotation angle for drawing.
   double angle_ = 0.0;
 
+  // Size in pixels of the square to draw.
+  const int square_size_;
+
   DISALLOW_COPY_AND_ASSIGN(WindowTreeData);
 };
 
 void MusDemo::WindowTreeData::Init(
     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
   window_tree_host->InitHost();
   window_tree_host->Show();
   // Take ownership of the WTH.
   window_tree_host_ = std::move(window_tree_host);
 
@@ skipping 96 matching lines @@
 
 void MusDemo::OnWmWillCreateDisplay(const display::Display& display) {
   screen_->display_list().AddDisplay(display,
                                      display::DisplayList::Type::PRIMARY);
 }
 
 void MusDemo::OnWmNewDisplay(
     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
     const display::Display& display) {
   DCHECK(!window_tree_data_);  // Only support one display.
-  window_tree_data_ =
-      base::MakeUnique<WindowTreeData>(std::move(window_tree_host));
+  window_tree_data_ = base::MakeUnique<WindowTreeData>(
+      std::move(window_tree_host), kSquareSize);
 }
 
 void MusDemo::OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) {
   window_tree_data_.reset();
 }
 
 void MusDemo::OnWmDisplayModified(const display::Display& display) {}
 
 mojom::EventResult MusDemo::OnAccelerator(uint32_t id, const Event& event) {
   return mojom::EventResult::UNHANDLED;
@@ skipping 27 matching lines @@
   // Allocate a bitmap of correct size.
   SkBitmap bitmap;
   SkImageInfo image_info = SkImageInfo::MakeN32(bounds.width(), bounds.height(),
                                                 kPremul_SkAlphaType);
   bitmap.allocPixels(image_info);
 
   // Draw the rotated square on background in bitmap.
   SkCanvas canvas(bitmap);
   canvas.clear(kBgColor);
   // TODO(kylechar): Add GL drawing instead of software rasterization in future.
-  DrawSquare(bounds, angle_, &canvas);
+  DrawSquare(bounds, angle_, &canvas, square_size_);
   canvas.flush();
 
   gfx::ImageSkiaRep image_skia_rep(bitmap, 1);
   gfx::ImageSkia image_skia(image_skia_rep);
   gfx::Image image(image_skia);
 
   window_delegate_->SetImage(image);
   bitmap_window()->SchedulePaintInRect(gfx::Rect(bounds.size()));
 }
 
 }  // namespace demo
 }  // namespace aura