WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Dirk Schulze <vbs85@gmx.de>
  * Copyright (C) 2008 Nuanti Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 88 matching lines @@
 {
     destroyGraphicsContextPrivate(m_common);
     delete m_data;
 }
 
 TransformationMatrix GraphicsContext::getCTM() const
 {
     cairo_t* cr = platformContext();
     cairo_matrix_t m;
     cairo_get_matrix(cr, &m);
-    return m;
+    return TransformationMatrix(m.xx, m.yx, m.xy, m.yy, m.x0, m.y0);
 }
 
 cairo_t* GraphicsContext::platformContext() const
 {
     return m_data->cr;
 }
 
 void GraphicsContext::savePlatformState()
 {
     cairo_save(m_data->cr);
@@ skipping 605 matching lines @@
 {
     notImplemented();
 }
 
 void GraphicsContext::concatCTM(const TransformationMatrix& transform)
 {
     if (paintingDisabled())
         return;
 
     cairo_t* cr = m_data->cr;
-    const cairo_matrix_t* matrix = reinterpret_cast<const cairo_matrix_t*>(&transform);
-    cairo_transform(cr, matrix);
+    const cairo_matrix_t matrix = cairo_matrix_t(transform);
+    cairo_transform(cr, &matrix);
     m_data->concatCTM(transform);
 }
 
 void GraphicsContext::addInnerRoundedRectClip(const IntRect& rect, int thickness)
 {
     if (paintingDisabled())
         return;
 
     clip(rect);
 
@@ skipping 346 matching lines @@
 
 InterpolationQuality GraphicsContext::imageInterpolationQuality() const
 {
     return InterpolationDefault;
 }
 
 } // namespace WebCore
 
 #endif // PLATFORM(CAIRO)