Fix transforms to be preconcat like skia so multiple transforms are accumulat...

gfx/canvas_direct2d.cc

 // Copyright (c) 2010 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 "gfx/canvas_direct2d.h"
 
 #include "gfx/rect.h"
 
 namespace {
 
@@ skipping 99 matching lines @@
 bool CanvasDirect2D::ClipRectInt(int x, int y, int w, int h) {
   rt_->PushAxisAlignedClip(RectToRectF(x, y, w, h),
                            D2D1_ANTIALIAS_MODE_PER_PRIMITIVE);
   // Increment the clip count so the call to PushAxisAlignedClip() can be
   // balanced with a call to PopAxisAlignedClip in the next Restore().
   ++state_.top().clip_count;
   return w > 0 && h > 0;
 }
 
 void CanvasDirect2D::TranslateInt(int x, int y) {
-  rt_->SetTransform(D2D1::Matrix3x2F::Translation(static_cast<float>(x),
-                                                  static_cast<float>(y)));
+  D2D1_MATRIX_3X2_F raw;
+  rt_->GetTransform(&raw);
+  D2D1::Matrix3x2F transform(raw._11, raw._12, raw._21, raw._22, raw._31,
+                             raw._32);
+  transform = D2D1::Matrix3x2F::Translation(static_cast<float>(x),
+                                            static_cast<float>(y)) * transform;
+  rt_->SetTransform(transform);
 }
 
 void CanvasDirect2D::ScaleInt(int x, int y) {
-  rt_->SetTransform(D2D1::Matrix3x2F::Scale(static_cast<float>(x),
-                                            static_cast<float>(y)));
+  D2D1_MATRIX_3X2_F raw;
+  rt_->GetTransform(&raw);
+  D2D1::Matrix3x2F transform(raw._11, raw._12, raw._21, raw._22, raw._31,
+                             raw._32);
+  transform = D2D1::Matrix3x2F::Scale(static_cast<float>(x),
+                                      static_cast<float>(y)) * transform;
+  rt_->SetTransform(transform);
 }
 
 void CanvasDirect2D::FillRectInt(int x, int y, int w, int h,
                                  const SkPaint& paint) {
 }
 
 void CanvasDirect2D::FillRectInt(const SkColor& color, int x, int y, int w,
                                  int h) {
   ScopedComPtr<ID2D1SolidColorBrush> solid_brush;
   rt_->CreateSolidColorBrush(SkColorToColorF(color), solid_brush.Receive());
@@ skipping 97 matching lines @@
 // CanvasDirect2D, private:
 
 void CanvasDirect2D::SaveInternal(ID2D1Layer* layer) {
   if (!drawing_state_block_)
     GetD2D1Factory()->CreateDrawingStateBlock(drawing_state_block_.Receive());
   rt_->SaveDrawingState(drawing_state_block_.get());
   state_.push(RenderState(layer));
 }
 
 }  // namespace gfx