Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Side by Side Diff: Source/platform/transforms/MatrixTransformOperation.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
OLDNEW
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 } 43 }
44 44
45 TransformationMatrix matrix() const { return TransformationMatrix(m_a, m_b, m_c, m_d, m_e, m_f); } 45 TransformationMatrix matrix() const { return TransformationMatrix(m_a, m_b, m_c, m_d, m_e, m_f); }
46 46
47 virtual bool canBlendWith(const TransformOperation& other) const 47 virtual bool canBlendWith(const TransformOperation& other) const
48 { 48 {
49 return false; 49 return false;
50 } 50 }
51 51
52 private: 52 private:
53 virtual OperationType type() const OVERRIDE { return Matrix; } 53 virtual OperationType type() const override { return Matrix; }
54 54
55 virtual bool operator==(const TransformOperation& o) const OVERRIDE 55 virtual bool operator==(const TransformOperation& o) const override
56 { 56 {
57 if (!isSameType(o)) 57 if (!isSameType(o))
58 return false; 58 return false;
59 59
60 const MatrixTransformOperation* m = static_cast<const MatrixTransformOpe ration*>(&o); 60 const MatrixTransformOperation* m = static_cast<const MatrixTransformOpe ration*>(&o);
61 return m_a == m->m_a && m_b == m->m_b && m_c == m->m_c && m_d == m->m_d && m_e == m->m_e && m_f == m->m_f; 61 return m_a == m->m_a && m_b == m->m_b && m_c == m->m_c && m_d == m->m_d && m_e == m->m_e && m_f == m->m_f;
62 } 62 }
63 63
64 virtual void apply(TransformationMatrix& transform, const FloatSize&) const OVERRIDE 64 virtual void apply(TransformationMatrix& transform, const FloatSize&) const override
65 { 65 {
66 TransformationMatrix matrix(m_a, m_b, m_c, m_d, m_e, m_f); 66 TransformationMatrix matrix(m_a, m_b, m_c, m_d, m_e, m_f);
67 transform.multiply(matrix); 67 transform.multiply(matrix);
68 } 68 }
69 69
70 virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) OVERRIDE; 70 virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
71 71
72 MatrixTransformOperation(double a, double b, double c, double d, double e, d ouble f) 72 MatrixTransformOperation(double a, double b, double c, double d, double e, d ouble f)
73 : m_a(a) 73 : m_a(a)
74 , m_b(b) 74 , m_b(b)
75 , m_c(c) 75 , m_c(c)
76 , m_d(d) 76 , m_d(d)
77 , m_e(e) 77 , m_e(e)
78 , m_f(f) 78 , m_f(f)
79 { 79 {
80 } 80 }
(...skipping 12 matching lines...) Expand all
93 double m_b; 93 double m_b;
94 double m_c; 94 double m_c;
95 double m_d; 95 double m_d;
96 double m_e; 96 double m_e;
97 double m_f; 97 double m_f;
98 }; 98 };
99 99
100 } // namespace blink 100 } // namespace blink
101 101
102 #endif // MatrixTransformOperation_h 102 #endif // MatrixTransformOperation_h
OLDNEW
« no previous file with comments | « Source/platform/transforms/Matrix3DTransformOperation.h ('k') | Source/platform/transforms/PerspectiveTransformOperation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698