| Index: cc/base/scale_translate2d.h
|
| diff --git a/cc/base/scale_translate2d.h b/cc/base/scale_translate2d.h
|
| index 8d9efe79d457887920ca41a3cc9a1a585e835130..0a803b00044c69c01edfe995a66bc8902b467279 100644
|
| --- a/cc/base/scale_translate2d.h
|
| +++ b/cc/base/scale_translate2d.h
|
| @@ -14,7 +14,7 @@ namespace cc {
|
|
|
| class ScaleTranslate2d {
|
| public:
|
| - constexpr ScaleTranslate2d() : scale_(1.f) { }
|
| + constexpr ScaleTranslate2d() : scale_(1.f) {}
|
| constexpr ScaleTranslate2d(float scale, const gfx::Vector2dF& translation)
|
| : scale_(scale), translation_(translation) {}
|
|
|
| @@ -39,8 +39,7 @@ class ScaleTranslate2d {
|
| static ScaleTranslate2d PreTranslate(const ScaleTranslate2d& t,
|
| const gfx::Vector2dF& translation) {
|
| return ScaleTranslate2d(
|
| - t.scale_,
|
| - gfx::ScaleVector2d(translation, t.scale_) + t.translation_);
|
| + t.scale_, gfx::ScaleVector2d(translation, t.scale_) + t.translation_);
|
| }
|
| void PreTranslate(const gfx::Vector2dF& translation) {
|
| *this = PreTranslate(*this, translation);
|
| @@ -58,8 +57,7 @@ class ScaleTranslate2d {
|
| const ScaleTranslate2d& pre) {
|
| return ScaleTranslate2d(
|
| pre.scale_ * post.scale_,
|
| - gfx::ScaleVector2d(pre.translation_, post.scale_) +
|
| - post.translation_);
|
| + gfx::ScaleVector2d(pre.translation_, post.scale_) + post.translation_);
|
| }
|
| void PreConcat(const ScaleTranslate2d& other) {
|
| *this = Concat(*this, other);
|
| @@ -69,9 +67,8 @@ class ScaleTranslate2d {
|
| }
|
|
|
| static ScaleTranslate2d Inverse(const ScaleTranslate2d& t) {
|
| - return ScaleTranslate2d(
|
| - 1 / t.scale_,
|
| - gfx::ScaleVector2d(-t.translation_, 1 / t.scale_));
|
| + return ScaleTranslate2d(1 / t.scale_,
|
| + gfx::ScaleVector2d(-t.translation_, 1 / t.scale_));
|
| }
|
| void Invert() { *this = Inverse(*this); }
|
|
|
|
|