LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Calculate max bounds correctly in winscope" into rvc-dev am: 69939a60d2

Browse Source 
Change-Id: I6a3725d7dc18a2397096441e160498ecf76ba060
This commit is contained in:
TreeHugger Robot
2020-03-20 18:12:10 +00:00
committed by Automerger Merge Worker
parent 10cc9f4812 69939a60d2
commit f092d9ab93
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/winscope/src/Rects.vue
View File

@@ -24,6 +24,8 @@
<script>
import { multiply_rect } from './matrix_utils.js'
export default {
name: 'rects',
props: ['bounds', 'rects', 'highlight'],
@@ -37,8 +39,8 @@ export default {
if (this.bounds) {
return this.bounds;
}
var width = Math.max(...this.rects.map((r) => r.right));
var height = Math.max(...this.rects.map((r) => r.bottom));
var width = Math.max(...this.rects.map((r) => multiply_rect(r.transform, r).right));
var height = Math.max(...this.rects.map((r) => multiply_rect(r.transform, r).bottom));
return {width, height};
},
boundsStyle() {

30
tools/winscope/src/matrix_utils.js
View File

@@ -172,4 +172,32 @@ function is_type_flag_clear(transform, bits) {
return (type & bits) === 0;
}
export {format_transform_type, fill_transform_data, is_simple_transform};
function multiply_vec2(matrix, x, y) {
// |dsdx dsdy tx| | x |
// |dtdx dtdy ty| x | y |
// |0 0 1 | | 1 |
return {
x: matrix.dsdx * x + matrix.dsdy * y + matrix.tx,
y: matrix.dtdx * x + matrix.dtdy * y + matrix.ty
};
}
function multiply_rect(matrix, rect) {
// |dsdx dsdy tx| | left, top |
// matrix = |dtdx dtdy ty| rect = | |
// |0 0 1 | | right, bottom |
var left_top = multiply_vec2(matrix, rect.left, rect.top);
var right_top = multiply_vec2(matrix, rect.right, rect.top);
var left_bottom = multiply_vec2(matrix, rect.left, rect.bottom);
var right_bottom = multiply_vec2(matrix, rect.right, rect.bottom);
var outrect = {};
outrect.left = Math.min(left_top.x, right_top.x, left_bottom.x, right_bottom.x);
outrect.top = Math.min(left_top.y, right_top.y, left_bottom.y, right_bottom.y);
outrect.right = Math.max(left_top.x, right_top.x, left_bottom.x, right_bottom.x);
outrect.bottom = Math.max(left_top.y, right_top.y, left_bottom.y, right_bottom.y);
return outrect;
}
export {format_transform_type, fill_transform_data, is_simple_transform, multiply_rect};