summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/platform/transforms/transformation_matrix.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-13 16:23:34 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-14 10:37:21 +0000
commit38a9a29f4f9436cace7f0e7abf9c586057df8a4e (patch)
treec4e8c458dc595bc0ddb435708fa2229edfd00bd4 /chromium/third_party/blink/renderer/platform/transforms/transformation_matrix.h
parente684a3455bcc29a6e3e66a004e352dea4e1141e7 (diff)
downloadqtwebengine-chromium-38a9a29f4f9436cace7f0e7abf9c586057df8a4e.tar.gz
BASELINE: Update Chromium to 73.0.3683.37
Change-Id: I08c9af2948b645f671e5d933aca1f7a90ea372f2 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/platform/transforms/transformation_matrix.h')
-rw-r--r--chromium/third_party/blink/renderer/platform/transforms/transformation_matrix.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/chromium/third_party/blink/renderer/platform/transforms/transformation_matrix.h b/chromium/third_party/blink/renderer/platform/transforms/transformation_matrix.h
index 816565aec6f..7f524dca1b8 100644
--- a/chromium/third_party/blink/renderer/platform/transforms/transformation_matrix.h
+++ b/chromium/third_party/blink/renderer/platform/transforms/transformation_matrix.h
@@ -393,10 +393,20 @@ class PLATFORM_EXPORT TransformationMatrix {
double perspective_x, perspective_y, perspective_z, perspective_w;
} DecomposedType;
+ // Decompose 2-D transform matrix into its component parts.
+ typedef struct {
+ double scale_x, scale_y;
+ double skew_xy;
+ double translate_x, translate_y;
+ double angle;
+ } Decomposed2dType;
+
WARN_UNUSED_RESULT bool Decompose(DecomposedType&) const;
+ WARN_UNUSED_RESULT bool Decompose2D(Decomposed2dType&) const;
void Recompose(const DecomposedType&);
-
+ void Recompose2D(const Decomposed2dType&);
void Blend(const TransformationMatrix& from, double progress);
+ void Blend2D(const TransformationMatrix& from, double progress);
bool IsAffine() const {
return M13() == 0 && M14() == 0 && M23() == 0 && M24() == 0 && M31() == 0 &&
@@ -475,6 +485,8 @@ class PLATFORM_EXPORT TransformationMatrix {
matrix_[2][3] == 0 && matrix_[3][2] == 0 && matrix_[3][3] == 1;
}
+ bool Is2dTransform() const;
+
bool IsIntegerTranslation() const;
// Returns true if axis-aligned 2d rects will remain axis-aligned after being