Source/platform/transforms/ScaleTransformOperation.h - Issue 1196913005: Implement animations for Independent CSS Transform Properties

Side by Side Diff: Source/platform/transforms/ScaleTransformOperation.h

Issue 1196913005: Implement animations for Independent CSS Transform Properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Remove Compositor Animations and add tests for inherit and initial Created 5 years, 6 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 unified diff | Download patch

« Source/core/style/ComputedStyle.h ('K') | « Source/platform/transforms/RotateTransformOperation.h ('k') | Source/platform/transforms/TransformOperation.h » ('j') | Source/platform/transforms/TransformOperation.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)

3 * (C) 2000 Antti Koivisto (koivisto@kde.org)	3 * (C) 2000 Antti Koivisto (koivisto@kde.org)

4 * (C) 2000 Dirk Mueller (mueller@kde.org)	4 * (C) 2000 Dirk Mueller (mueller@kde.org)

5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.	5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.

6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)	6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)

7 *	7 *

8 * This library is free software; you can redistribute it and/or	8 * This library is free software; you can redistribute it and/or

9 * modify it under the terms of the GNU Library General Public	9 * modify it under the terms of the GNU Library General Public

10 * License as published by the Free Software Foundation; either	10 * License as published by the Free Software Foundation; either

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44 double x() const { return m_x; }	44 double x() const { return m_x; }

45 double y() const { return m_y; }	45 double y() const { return m_y; }

46 double z() const { return m_z; }	46 double z() const { return m_z; }

47	47

48 virtual bool canBlendWith(const TransformOperation& other) const;	48 virtual bool canBlendWith(const TransformOperation& other) const;

49	49

50 virtual void apply(TransformationMatrix& transform, const FloatSize&) const override	50 virtual void apply(TransformationMatrix& transform, const FloatSize&) const override

51 {	51 {

52 transform.scale3d(m_x, m_y, m_z);	52 transform.scale3d(m_x, m_y, m_z);

53 }	53 }

	54 virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;

54	55

55 private:	56 private:

56 virtual OperationType type() const override { return m_type; }	57 virtual OperationType type() const override { return m_type; }

57	58

58 virtual bool operator==(const TransformOperation& o) const override	59 virtual bool operator==(const TransformOperation& o) const override

59 {	60 {

60 if (!isSameType(o))	61 if (!isSameType(o))

61 return false;	62 return false;

62 const ScaleTransformOperation* s = static_cast<const ScaleTransformOpera tion*>(&o);	63 const ScaleTransformOperation* s = static_cast<const ScaleTransformOpera tion*>(&o);

63 return m_x == s->m_x && m_y == s->m_y && m_z == s->m_z;	64 return m_x == s->m_x && m_y == s->m_y && m_z == s->m_z;

64 }	65 }

65	66

66 virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;

67

68 ScaleTransformOperation(double sx, double sy, double sz, OperationType type)	67 ScaleTransformOperation(double sx, double sy, double sz, OperationType type)

69 : m_x(sx)	68 : m_x(sx)

70 , m_y(sy)	69 , m_y(sy)

71 , m_z(sz)	70 , m_z(sz)

72 , m_type(type)	71 , m_type(type)

73 {	72 {

74 ASSERT(type == ScaleX \|\| type == ScaleY \|\| type == ScaleZ \|\| type == Sca le \|\| type == Scale3D);	73 ASSERT(type == ScaleX \|\| type == ScaleY \|\| type == ScaleZ \|\| type == Sca le \|\| type == Scale3D);

75 }	74 }

76	75

77 double m_x;	76 double m_x;

78 double m_y;	77 double m_y;

79 double m_z;	78 double m_z;

80 OperationType m_type;	79 OperationType m_type;

81 };	80 };

82	81

	82 DEFINE_TRANSFORM_TYPE_CASTS(ScaleTransformOperation, isScale());

	83

83 } // namespace blink	84 } // namespace blink

84	85

85 #endif // ScaleTransformOperation_h	86 #endif // ScaleTransformOperation_h

OLD	NEW