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

Side by Side Diff: Source/platform/transforms/PerspectiveTransformOperation.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) 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
38 } 38 }
39 39
40 double perspective() const { return m_p; } 40 double perspective() const { return m_p; }
41 41
42 virtual bool canBlendWith(const TransformOperation& other) const 42 virtual bool canBlendWith(const TransformOperation& other) const
43 { 43 {
44 return isSameType(other); 44 return isSameType(other);
45 } 45 }
46 46
47 private: 47 private:
48 virtual OperationType type() const OVERRIDE { return Perspective; } 48 virtual OperationType type() const override { return Perspective; }
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 PerspectiveTransformOperation* p = static_cast<const PerspectiveTr ansformOperation*>(&o); 54 const PerspectiveTransformOperation* p = static_cast<const PerspectiveTr ansformOperation*>(&o);
55 return m_p == p->m_p; 55 return m_p == p->m_p;
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.applyPerspective(m_p); 60 transform.applyPerspective(m_p);
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 PerspectiveTransformOperation(double p) 65 PerspectiveTransformOperation(double p)
66 : m_p(p) 66 : m_p(p)
67 { 67 {
68 } 68 }
69 69
70 double m_p; 70 double m_p;
71 }; 71 };
72 72
73 } // namespace blink 73 } // namespace blink
74 74
75 #endif // PerspectiveTransformOperation_h 75 #endif // PerspectiveTransformOperation_h
OLDNEW
« no previous file with comments | « Source/platform/transforms/MatrixTransformOperation.h ('k') | Source/platform/transforms/RotateTransformOperation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698