WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp

 /*
  * Copyright (C) 2006 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2006 Zack Rusin <zack@kde.org>
  * Copyright (C) 2006 George Staikos <staikos@kde.org>
  * Copyright (C) 2006 Simon Hausmann <hausmann@kde.org>
  * Copyright (C) 2006 Allan Sandfeld Jensen <sandfeld@kde.org>
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
  * Copyright (C) 2008 Dirk Schulze <vbs85@gmx.de>
@@ skipping 248 matching lines @@
     delete m_data;
 }
 
 PlatformGraphicsContext* GraphicsContext::platformContext() const
 {
     return m_data->p();
 }
 
 TransformationMatrix GraphicsContext::getCTM() const
 {
-    return platformContext()->combinedMatrix();
+    QMatrix matrix(platformContext()->combinedMatrix());
+    return TransformationMatrix(matrix.m11(), matrix.m12(), matrix.m21(), matrix.m22(), matrix.dx(), matrix.dy());
 }
 
 void GraphicsContext::savePlatformState()
 {
     m_data->p()->save();
 }
 
 void GraphicsContext::restorePlatformState()
 {
     m_data->p()->restore();
@@ skipping 669 matching lines @@
 void GraphicsContext::scale(const FloatSize& s)
 {
     if (paintingDisabled())
         return;
 
     m_data->p()->scale(s.width(), s.height());
 
     if (!m_data->currentPath.isEmpty()) {
         QMatrix matrix;
         m_data->currentPath = m_data->currentPath * matrix.scale(1 / s.width(), 1 / s.height());
-        m_common->state.pathTransform.scale(s.width(), s.height());
+        m_common->state.pathTransform.scaleNonUniform(s.width(), s.height());
     }
 }
 
 void GraphicsContext::clipOut(const IntRect& rect)
 {
     if (paintingDisabled())
         return;
 
     QPainter *p = m_data->p();
     QRectF clipBounds = p->clipPath().boundingRect();
@@ skipping 203 matching lines @@
 
 InterpolationQuality GraphicsContext::imageInterpolationQuality() const
 {
     return InterpolationDefault;
 }
 
 }
 
 // vim: ts=4 sw=4 et