Source/platform/transforms/Matrix3DTransformOperation.h - Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform

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

Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase build fix Created 6 years, 2 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

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2009 Apple Inc. All rights reserved.	2 * Copyright (C) 2009 Apple Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 27 matching lines...) Expand all Loading...
38 }	38 }

39	39

40 TransformationMatrix matrix() const {return m_matrix; }	40 TransformationMatrix matrix() const {return m_matrix; }

41	41

42 virtual bool canBlendWith(const TransformOperation& other) const	42 virtual bool canBlendWith(const TransformOperation& other) const

43 {	43 {

44 return false;	44 return false;

45 }	45 }

46	46

47 private:	47 private:

48 virtual OperationType type() const OVERRIDE { return Matrix3D; }	48 virtual OperationType type() const override { return Matrix3D; }

49	49

50 virtual bool operator==(const TransformOperation& o) const OVERRIDE	50 virtual bool operator==(const TransformOperation& o) const override

51 {	51 {

52 if (!isSameType(o))	52 if (!isSameType(o))

53 return false;	53 return false;

54 const Matrix3DTransformOperation* m = static_cast<const Matrix3DTransfor mOperation*>(&o);	54 const Matrix3DTransformOperation* m = static_cast<const Matrix3DTransfor mOperation*>(&o);

55 return m_matrix == m->m_matrix;	55 return m_matrix == m->m_matrix;

56 }	56 }

57	57

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

59 {	59 {

60 transform.multiply(TransformationMatrix(m_matrix));	60 transform.multiply(TransformationMatrix(m_matrix));

61 }	61 }

62	62

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

64	64

65 Matrix3DTransformOperation(const TransformationMatrix& mat)	65 Matrix3DTransformOperation(const TransformationMatrix& mat)

66 {	66 {

67 m_matrix = mat;	67 m_matrix = mat;

68 }	68 }

69	69

70 TransformationMatrix m_matrix;	70 TransformationMatrix m_matrix;

71 };	71 };

72	72

73 } // namespace blink	73 } // namespace blink

74	74

75 #endif // Matrix3DTransformOperation_h	75 #endif // Matrix3DTransformOperation_h

OLD	NEW