WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/css/WebKitCSSMatrix.cpp

 /*
  * Copyright (C) 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 107 matching lines @@
         y = 0; 
     return WebKitCSSMatrix::create(m_matrix.translate(x, y));
 }
 
 PassRefPtr<WebKitCSSMatrix> WebKitCSSMatrix::scale(float scaleX, float scaleY)
 {
     if (isnan(scaleX))
         scaleX = 1; 
     if (isnan(scaleY))
         scaleY = scaleX; 
-    return WebKitCSSMatrix::create(m_matrix.scale(scaleX,scaleY));
+    return WebKitCSSMatrix::create(m_matrix.scaleNonUniform(scaleX,scaleY));
 }
 
 PassRefPtr<WebKitCSSMatrix> WebKitCSSMatrix::rotate(float rot)
 {
     if (isnan(rot))
         rot = 0;
     return WebKitCSSMatrix::create(m_matrix.rotate(rot));
 }
 
 String WebKitCSSMatrix::toString()
 {
     return String::format("matrix(%f, %f, %f, %f, %f, %f)",
                             m_matrix.a(), m_matrix.b(), m_matrix.c(), m_matrix.d(), m_matrix.e(), m_matrix.f());
 }
 
 } // namespace WebCore