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

Side by Side Diff: Source/platform/transforms/InterpolatedTransformOperation.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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 { 43 {
44 return adoptRef(new InterpolatedTransformOperation(from, to, progress)); 44 return adoptRef(new InterpolatedTransformOperation(from, to, progress));
45 } 45 }
46 46
47 virtual bool canBlendWith(const TransformOperation& other) const 47 virtual bool canBlendWith(const TransformOperation& other) const
48 { 48 {
49 return isSameType(other); 49 return isSameType(other);
50 } 50 }
51 51
52 private: 52 private:
53 virtual OperationType type() const OVERRIDE { return Interpolated; } 53 virtual OperationType type() const override { return Interpolated; }
54 54
55 virtual bool operator==(const TransformOperation&) const OVERRIDE; 55 virtual bool operator==(const TransformOperation&) const override;
56 virtual void apply(TransformationMatrix&, const FloatSize& borderBoxSize) co nst OVERRIDE; 56 virtual void apply(TransformationMatrix&, const FloatSize& borderBoxSize) co nst override;
57 57
58 virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) OVERRIDE; 58 virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
59 59
60 virtual bool dependsOnBoxSize() const OVERRIDE 60 virtual bool dependsOnBoxSize() const override
61 { 61 {
62 return from.dependsOnBoxSize() || to.dependsOnBoxSize(); 62 return from.dependsOnBoxSize() || to.dependsOnBoxSize();
63 } 63 }
64 64
65 InterpolatedTransformOperation(const TransformOperations& from, const Transf ormOperations& to, double progress) 65 InterpolatedTransformOperation(const TransformOperations& from, const Transf ormOperations& to, double progress)
66 : from(from) 66 : from(from)
67 , to(to) 67 , to(to)
68 , progress(progress) 68 , progress(progress)
69 { } 69 { }
70 70
71 const TransformOperations from; 71 const TransformOperations from;
72 const TransformOperations to; 72 const TransformOperations to;
73 double progress; 73 double progress;
74 }; 74 };
75 75
76 } // namespace blink 76 } // namespace blink
77 77
78 #endif // InterpolatedTransformOperation_h 78 #endif // InterpolatedTransformOperation_h
79 79
OLDNEW
« no previous file with comments | « Source/platform/transforms/IdentityTransformOperation.h ('k') | Source/platform/transforms/Matrix3DTransformOperation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698