WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp

 /*
  * Copyright (c) 2006, Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 772 matching lines @@
     addCornerArc(&path, r, topLeft, 180);
 
     SkPaint paint;
     platformContext()->setupPaintForFilling(&paint);
     platformContext()->canvas()->drawPath(path, paint);
     return fillRect(rect, color);
 }
 
 TransformationMatrix GraphicsContext::getCTM() const
 {
-    return platformContext()->canvas()->getTotalMatrix();
+    const SkMatrix& m = platformContext()->canvas()->getTotalMatrix();
+    return TransformationMatrix(SkScalarToDouble(m.getScaleX()),      // a
+                                SkScalarToDouble(m.getSkewY()),       // b
+                                SkScalarToDouble(m.getSkewX()),       // c
+                                SkScalarToDouble(m.getScaleY()),      // d
+                                SkScalarToDouble(m.getTranslateX()),  // e
+                                SkScalarToDouble(m.getTranslateY())); // f
 }
 
 FloatRect GraphicsContext::roundToDevicePixels(const FloatRect& rect)
 {
     // This logic is copied from GraphicsContextCG, eseidel 5/05/08
 
     // It is not enough just to round to pixels in device space. The rotation
     // part of the affine transform matrix to device space can mess with this
     // conversion if we have a rotating image like the hands of the world clock
     // widget. We just need the scale, so we get the affine transform matrix and
@@ skipping 310 matching lines @@
 void GraphicsContext::translate(float w, float h)
 {
     if (paintingDisabled())
         return;
 
     platformContext()->canvas()->translate(WebCoreFloatToSkScalar(w),
                                            WebCoreFloatToSkScalar(h));
 }
 
 }  // namespace WebCore