gfx::Transform API clean-up

ui/views/corewm/image_grid.cc

 // Copyright (c) 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 "ui/views/corewm/image_grid.h"
 
 #include <algorithm>
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkXfermode.h"
@@ skipping 89 matching lines @@
   const int top = min(base_top_row_height_, size_.height() / 2);
   const int bottom = min(base_bottom_row_height_, size_.height() - top);
 
   // The remaining space goes to the center image.
   int center_width = std::max(size.width() - left - right, 0);
   int center_height = std::max(size.height() - top - bottom, 0);
 
   if (top_layer_.get()) {
     if (center_width > 0) {
       gfx::Transform transform;
-      transform.SetScaleX(
-          static_cast<float>(center_width) / top_layer_->bounds().width());
-      transform.ConcatTranslate(left, 0);
+      transform.Translate(left, 0);
+      transform.Scale(
+          static_cast<float>(center_width) / top_layer_->bounds().width(), 1);
       top_layer_->SetTransform(transform);
     }
     top_layer_->SetVisible(center_width > 0);
   }
   if (bottom_layer_.get()) {
     if (center_width > 0) {
       gfx::Transform transform;
-      transform.SetScaleX(
-          static_cast<float>(center_width) / bottom_layer_->bounds().width());
-      transform.ConcatTranslate(
+      transform.Translate(
           left, size.height() - bottom_layer_->bounds().height());
+      transform.Scale(
+          static_cast<float>(center_width) / bottom_layer_->bounds().width(),
+          1.0);
       bottom_layer_->SetTransform(transform);
     }
     bottom_layer_->SetVisible(center_width > 0);
   }
   if (left_layer_.get()) {
     if (center_height > 0) {
       gfx::Transform transform;
-      transform.SetScaleY(
+      transform.Translate(0, top);
+      transform.Scale(
+          1.0,
           (static_cast<float>(center_height) / left_layer_->bounds().height()));
-      transform.ConcatTranslate(0, top);
       left_layer_->SetTransform(transform);
     }
     left_layer_->SetVisible(center_height > 0);
   }
   if (right_layer_.get()) {
     if (center_height > 0) {
       gfx::Transform transform;
-      transform.SetScaleY(
+      transform.Translate(
+          size.width() - right_layer_->bounds().width(), top);
+      transform.Scale(
+          1.0,
           static_cast<float>(center_height) / right_layer_->bounds().height());
-      transform.ConcatTranslate(
-          size.width() - right_layer_->bounds().width(), top);
       right_layer_->SetTransform(transform);
     }
     right_layer_->SetVisible(center_height > 0);
   }
 
   if (top_left_layer_.get()) {
     // No transformation needed; it should be at (0, 0) and unscaled.
     top_left_painter_->SetClipRect(
         LayerExceedsSize(top_left_layer_.get(), gfx::Size(left, top)) ?
             gfx::Rect(gfx::Rect(0, 0, left, top)) :
             gfx::Rect(),
         top_left_layer_.get());
   }
   if (top_right_layer_.get()) {
     gfx::Transform transform;
-    transform.SetTranslateX(size.width() - top_right_layer_->bounds().width());
+    transform.Translate(size.width() - top_right_layer_->bounds().width(), 0.0);
     top_right_layer_->SetTransform(transform);
     top_right_painter_->SetClipRect(
         LayerExceedsSize(top_right_layer_.get(), gfx::Size(right, top)) ?
             gfx::Rect(top_right_layer_->bounds().width() - right, 0,
                       right, top) :
             gfx::Rect(),
         top_right_layer_.get());
   }
   if (bottom_left_layer_.get()) {
     gfx::Transform transform;
-    transform.SetTranslateY(
-        size.height() - bottom_left_layer_->bounds().height());
+    transform.Translate(
+        0.0, size.height() - bottom_left_layer_->bounds().height());
     bottom_left_layer_->SetTransform(transform);
     bottom_left_painter_->SetClipRect(
         LayerExceedsSize(bottom_left_layer_.get(), gfx::Size(left, bottom)) ?
             gfx::Rect(0, bottom_left_layer_->bounds().height() - bottom,
                       left, bottom) :
             gfx::Rect(),
         bottom_left_layer_.get());
   }
   if (bottom_right_layer_.get()) {
     gfx::Transform transform;
-    transform.SetTranslate(
+    transform.Translate(
         size.width() - bottom_right_layer_->bounds().width(),
         size.height() - bottom_right_layer_->bounds().height());
     bottom_right_layer_->SetTransform(transform);
     bottom_right_painter_->SetClipRect(
         LayerExceedsSize(bottom_right_layer_.get(), gfx::Size(right, bottom)) ?
             gfx::Rect(bottom_right_layer_->bounds().width() - right,
                       bottom_right_layer_->bounds().height() - bottom,
                       right, bottom) :
             gfx::Rect(),
         bottom_right_layer_.get());
   }
 
   if (center_layer_.get()) {
     if (center_width > 0 && center_height > 0) {
       gfx::Transform transform;
-      transform.SetScale(center_width / center_layer_->bounds().width(),
-                         center_height / center_layer_->bounds().height());
-      transform.ConcatTranslate(left, top);
+      transform.Translate(left, top);
+      transform.Scale(center_width / center_layer_->bounds().width(),
+                      center_height / center_layer_->bounds().height());
       center_layer_->SetTransform(transform);
     }
     center_layer_->SetVisible(center_width > 0 && center_height > 0);
   }
 }
 
 void ImageGrid::SetContentBounds(const gfx::Rect& content_bounds) {
   SetSize(gfx::Size(
       content_bounds.width() + left_image_width_ + right_image_width_,
       content_bounds.height() + top_image_height_ +
@@ skipping 63 matching lines @@
 
   painter_ptr->reset(new ImagePainter(image));
   layer_ptr->get()->set_delegate(painter_ptr->get());
   layer_ptr->get()->SetFillsBoundsOpaquely(false);
   layer_ptr->get()->SetVisible(true);
   layer_->Add(layer_ptr->get());
 }
 
 }  // namespace corewm
 }  // namespace views