summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-05-20 18:03:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-20 18:03:27 +0000
commit248c1775f026a29601791d705d18d137dd25eca1 (patch)
tree9da16d81810072b962a49a3d13435bd534658efa
parent431bcbd6b99711d96843013bbac2fb0acdaf8ff4 (diff)
parentaab157a4c8fd261ce3cb2d1e7acf7a8e783e1b76 (diff)
downloaddevelopment-248c1775f026a29601791d705d18d137dd25eca1.tar.gz
Merge "Ignore transform if not set" into rvc-dev am: aab157a4c8
Change-Id: Icdd52c41aae464ef72b61c37eccc77d216d3370f
-rw-r--r--tools/winscope/src/matrix_utils.js1
-rw-r--r--tools/winscope/tests/samples/wl_trace.pbbin0 -> 36163 bytes
2 files changed, 1 insertions, 0 deletions
diff --git a/tools/winscope/src/matrix_utils.js b/tools/winscope/src/matrix_utils.js
index e9cef2afe..cfada074e 100644
--- a/tools/winscope/src/matrix_utils.js
+++ b/tools/winscope/src/matrix_utils.js
@@ -173,6 +173,7 @@ function is_type_flag_clear(transform, bits) {
}
function multiply_vec2(matrix, x, y) {
+ if (!matrix) return {x, y};
// |dsdx dsdy tx| | x |
// |dtdx dtdy ty| x | y |
// |0 0 1 | | 1 |
diff --git a/tools/winscope/tests/samples/wl_trace.pb b/tools/winscope/tests/samples/wl_trace.pb
new file mode 100644
index 000000000..7e1f0075e
--- /dev/null
+++ b/tools/winscope/tests/samples/wl_trace.pb
Binary files differ