2009-11-04  Jeff Schiller  <codedread@gmail.com>

        Reviewed by NOBODY (OOPS!).

        Correct order of matrix multiplication for SVGMatrix.

        https://bugs.webkit.org/show_bug.cgi?id=16062

        Test: svg/dom/matrix-multiplication.html

        * bindings/js/JSSVGMatrixCustom.cpp:

        (WebCore::JSSVGMatrix::multiply):

        * svg/SVGMatrix.idl:

#include <runtime/Error.h>

JSValue JSSVGMatrix::multiply(ExecState* exec, const ArgList& args)

{

    if (!args.at(0).inherits(&JSSVGMatrix::s_info))

        return throwError(exec, TypeError, "secondMatrix argument was not a SVGMatrix");

    JSSVGMatrix* matrixObj = static_cast<JSSVGMatrix*>(asObject(args.at(0)));

    TransformationMatrix m1(*impl());

    TransformationMatrix m2(*(matrixObj->impl()));

    JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper<TransformationMatrix>::create(m1.multLeft(m2)).get(), m_context.get());

    return result;

}

2009-11-04  Jeff Schiller  <codedread@gmail.com>

        Reviewed by NOBODY (OOPS!).

        Added test to ensure proper order of matrix multiplication with SVGMatrix.

        https://bugs.webkit.org/show_bug.cgi?id=16062

        * svg/dom/matrix-multiplication-expected.txt: Added.

        * svg/dom/matrix-multiplication.html: Added.

This test checks to see if matrix multiplication is performed in the correct order for SVGMatrix objects.

If the test passes, you should see one line below about the matrix multiplication passing.

Matrix Multiplication Passed.

<!DOCTYPE html>

<html>

<head>

<script>

function print(message)

{

    var paragraph = document.createElement("li");

    paragraph.appendChild(document.createTextNode(message));

    document.getElementById("console").appendChild(paragraph);

}

function test()

{

    if (window.layoutTestController)

        layoutTestController.dumpAsText();

    var svgroot = document.createElementNS("http://www.w3.org/2000/svg","svg");

    var tx = svgroot.createSVGMatrix();

    var sx = svgroot.createSVGMatrix();

    tx = tx.translate(100,0);

    sx = sx.scaleNonUniform(2,1);

    var m = tx.multiply(sx);

    if (m.a == 2 && m.b == 0 && m.c == 0 && m.d == 1 && m.e == 100 && m.f == 0 && sx.a == 2 && sx.b == 0 && sx.c == 0 && sx.d == 1 && sx.e == 0 && sx.f == 0)

    	print("Matrix Multiplication Passed.");

    else

    	print("Matrix Multiplication Failed.");

}

</script>

</head>

<body onload="test()">

<p>This test checks to see if matrix multiplication is performed in the correct order for SVGMatrix objects.</p>

<p>If the test passes, you should see one line below about the matrix multiplication passing.</p>

<hr>

<p><ol id=console></ol></p>

</body>