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

Side by Side Diff: Source/platform/transforms/TranslateTransformOperation.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
« no previous file with comments | « Source/platform/transforms/SkewTransformOperation.h ('k') | Source/platform/weborigin/KURL.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 virtual bool canBlendWith(const TransformOperation& other) const; 46 virtual bool canBlendWith(const TransformOperation& other) const;
47 47
48 double x(const FloatSize& borderBoxSize) const { return floatValueForLength( m_x, borderBoxSize.width()); } 48 double x(const FloatSize& borderBoxSize) const { return floatValueForLength( m_x, borderBoxSize.width()); }
49 double y(const FloatSize& borderBoxSize) const { return floatValueForLength( m_y, borderBoxSize.height()); } 49 double y(const FloatSize& borderBoxSize) const { return floatValueForLength( m_y, borderBoxSize.height()); }
50 50
51 Length x() const { return m_x; } 51 Length x() const { return m_x; }
52 Length y() const { return m_y; } 52 Length y() const { return m_y; }
53 double z() const { return m_z; } 53 double z() const { return m_z; }
54 54
55 private: 55 private:
56 virtual OperationType type() const OVERRIDE { return m_type; } 56 virtual OperationType type() const override { return m_type; }
57 57
58 virtual bool operator==(const TransformOperation& o) const OVERRIDE 58 virtual bool operator==(const TransformOperation& o) const override
59 { 59 {
60 if (!isSameType(o)) 60 if (!isSameType(o))
61 return false; 61 return false;
62 const TranslateTransformOperation* t = static_cast<const TranslateTransf ormOperation*>(&o); 62 const TranslateTransformOperation* t = static_cast<const TranslateTransf ormOperation*>(&o);
63 return m_x == t->m_x && m_y == t->m_y && m_z == t->m_z; 63 return m_x == t->m_x && m_y == t->m_y && m_z == t->m_z;
64 } 64 }
65 65
66 virtual void apply(TransformationMatrix& transform, const FloatSize& borderB oxSize) const OVERRIDE 66 virtual void apply(TransformationMatrix& transform, const FloatSize& borderB oxSize) const override
67 { 67 {
68 transform.translate3d(x(borderBoxSize), y(borderBoxSize), z()); 68 transform.translate3d(x(borderBoxSize), y(borderBoxSize), z());
69 } 69 }
70 70
71 virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) OVERRIDE; 71 virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
72 72
73 virtual bool dependsOnBoxSize() const OVERRIDE 73 virtual bool dependsOnBoxSize() const override
74 { 74 {
75 return m_x.isPercent() || m_y.isPercent(); 75 return m_x.isPercent() || m_y.isPercent();
76 } 76 }
77 77
78 TranslateTransformOperation(const Length& tx, const Length& ty, double tz, O perationType type) 78 TranslateTransformOperation(const Length& tx, const Length& ty, double tz, O perationType type)
79 : m_x(tx) 79 : m_x(tx)
80 , m_y(ty) 80 , m_y(ty)
81 , m_z(tz) 81 , m_z(tz)
82 , m_type(type) 82 , m_type(type)
83 { 83 {
84 ASSERT(type == TranslateX || type == TranslateY || type == TranslateZ || type == Translate || type == Translate3D); 84 ASSERT(type == TranslateX || type == TranslateY || type == TranslateZ || type == Translate || type == Translate3D);
85 } 85 }
86 86
87 Length m_x; 87 Length m_x;
88 Length m_y; 88 Length m_y;
89 double m_z; 89 double m_z;
90 OperationType m_type; 90 OperationType m_type;
91 }; 91 };
92 92
93 } // namespace blink 93 } // namespace blink
94 94
95 #endif // TranslateTransformOperation_h 95 #endif // TranslateTransformOperation_h
OLDNEW
« no previous file with comments | « Source/platform/transforms/SkewTransformOperation.h ('k') | Source/platform/weborigin/KURL.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698