Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(301)

Unified Diff: sky/engine/core/painting/Canvas.cpp

Issue 1155193004: Canvas.concat takes a 16-element Float32List instead of an array. (Closed) Base URL: git@github.com:/domokit/mojo.git@master
Patch Set: . Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/painting/Canvas.h ('k') | sky/engine/core/painting/Canvas.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/painting/Canvas.cpp
diff --git a/sky/engine/core/painting/Canvas.cpp b/sky/engine/core/painting/Canvas.cpp
index 1fa585569f7064fcb3a07ecd2a2d8101a3604345..a0d14a5299b25427c8d0f2a58202d95aba263b27 100644
--- a/sky/engine/core/painting/Canvas.cpp
+++ b/sky/engine/core/painting/Canvas.cpp
@@ -83,15 +83,13 @@ void Canvas::skew(float sx, float sy)
m_canvas->skew(sx, sy);
}
-void Canvas::concat(const Vector<float>& matrix)
+void Canvas::concat(const Matrix4& matrix)
{
if (!m_canvas)
return;
ASSERT(m_displayList->isRecording());
- ASSERT(matrix.size() == 9);
- SkMatrix sk_matrix;
- sk_matrix.set9(matrix.data());
- m_canvas->concat(sk_matrix);
+ ASSERT(!matrix.is_null);
+ m_canvas->concat(matrix.sk_matrix);
}
void Canvas::clipRect(const Rect& rect)
« no previous file with comments | « sky/engine/core/painting/Canvas.h ('k') | sky/engine/core/painting/Canvas.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698