diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebCore/css/WebKitCSSMatrix.cpp | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebCore/css/WebKitCSSMatrix.cpp')
| -rw-r--r-- | WebCore/css/WebKitCSSMatrix.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/css/WebKitCSSMatrix.cpp b/WebCore/css/WebKitCSSMatrix.cpp index aaf5c3d..3714760 100644 --- a/WebCore/css/WebKitCSSMatrix.cpp +++ b/WebCore/css/WebKitCSSMatrix.cpp @@ -93,14 +93,14 @@ void WebKitCSSMatrix::setMatrixValue(const String& string, ExceptionCode& ec) ec = SYNTAX_ERR; } -// This is a multRight (this = this * secondMatrix) +// Perform a concatenation of the matrices (this * secondMatrix) PassRefPtr<WebKitCSSMatrix> WebKitCSSMatrix::multiply(WebKitCSSMatrix* secondMatrix) const { if (!secondMatrix) return 0; - TransformationMatrix tmp(m_matrix); - tmp.multiply(secondMatrix->m_matrix); + TransformationMatrix tmp(secondMatrix->m_matrix); + tmp.multiply(m_matrix); return WebKitCSSMatrix::create(tmp); } |