gfx::Transform API clean-up

ash/launcher/overflow_button.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 "ash/launcher/overflow_button.h"
 
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
@@ skipping 11 matching lines @@
 
 const int kButtonHoverAlpha = 150;
 
 const int kButtonCornerRadius = 2;
 
 const int kButtonHoverSize = 28;
 
 const int kBackgroundOffset = (48 - kButtonHoverSize) / 2;
 
 void RotateCounterclockwise(gfx::Transform* transform) {
-  transform->matrix().set3x3(0, -1, 0,
-                             1,  0, 0,
-                             0,  0, 1);
+  SkMatrix44 rotation;
+  rotation.set3x3(0, -1, 0,
+                  1,  0, 0,
+                  0,  0, 1);
+  transform->matrix().preConcat(rotation);
 }
 
 void RotateClockwise(gfx::Transform* transform) {
-  transform->matrix().set3x3( 0, 1, 0,
-                             -1, 0, 0,
-                              0, 0, 1);
+  SkMatrix44 rotation;
+  rotation.set3x3( 0, 1, 0,
+                  -1, 0, 0,
+                   0, 0, 1);
+  transform->matrix().preConcat(rotation);
 }
 
 }  // namesapce
 
 OverflowButton::OverflowButton(views::ButtonListener* listener)
     : CustomButton(listener),
       alignment_(SHELF_ALIGNMENT_BOTTOM),
       image_(NULL) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   image_ = rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW).ToImageSkia();
@@ skipping 54 matching lines @@
   }
 
   if (height() < kButtonHoverSize)
     return;
 
   gfx::Transform transform;
 
   switch (alignment_) {
     case SHELF_ALIGNMENT_BOTTOM:
       // Shift 1 pixel left to align with overflow bubble tip.
-      transform.ConcatTranslate(-1, kBackgroundOffset);
+      transform.Translate(-1, kBackgroundOffset);
       break;
     case SHELF_ALIGNMENT_LEFT:
+      transform.Translate(kBackgroundOffset, -1);
       RotateClockwise(&transform);
-      transform.ConcatTranslate(kBackgroundOffset, -1);
       break;
     case SHELF_ALIGNMENT_RIGHT:
+      transform.Translate(kBackgroundOffset, height());
       RotateCounterclockwise(&transform);
-      transform.ConcatTranslate(kBackgroundOffset, height());
       break;
   }
 
   canvas->Save();
   canvas->Transform(transform);
 
   gfx::Rect rect(GetContentsBounds());
   if (alignment_ == SHELF_ALIGNMENT_BOTTOM) {
     canvas->DrawImageInt(*image_,
                          rect.x() + (rect.width() - image_->width()) / 2,
                          kButtonHoverSize - image_->height());
   } else {
     canvas->DrawImageInt(*image_,
                          kButtonHoverSize - image_->width(),
                          rect.y() + (rect.height() - image_->height()) / 2);
   }
   canvas->Restore();
 }
 
 }  // namespace internal
 }  // namespace ash