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

Side by Side Diff: third_party/WebKit/WebCore/platform/graphics/transforms/ScaleTransformOperation.h

Issue 21184: WebKit merge 40722:40785 (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 10 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 | Annotate | Revision Log
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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 virtual bool operator==(const TransformOperation& o) const 47 virtual bool operator==(const TransformOperation& o) const
48 { 48 {
49 if (!isSameType(o)) 49 if (!isSameType(o))
50 return false; 50 return false;
51 const ScaleTransformOperation* s = static_cast<const ScaleTransformOpera tion*>(&o); 51 const ScaleTransformOperation* s = static_cast<const ScaleTransformOpera tion*>(&o);
52 return m_x == s->m_x && m_y == s->m_y; 52 return m_x == s->m_x && m_y == s->m_y;
53 } 53 }
54 54
55 virtual bool apply(TransformationMatrix& transform, const IntSize&) const 55 virtual bool apply(TransformationMatrix& transform, const IntSize&) const
56 { 56 {
57 transform.scale(m_x, m_y); 57 transform.scaleNonUniform(m_x, m_y);
58 return false; 58 return false;
59 } 59 }
60 60
61 virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false); 61 virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false);
62 62
63 ScaleTransformOperation(double sx, double sy, OperationType type) 63 ScaleTransformOperation(double sx, double sy, OperationType type)
64 : m_x(sx) 64 : m_x(sx)
65 , m_y(sy) 65 , m_y(sy)
66 , m_type(type) 66 , m_type(type)
67 { 67 {
68 } 68 }
69 69
70 double m_x; 70 double m_x;
71 double m_y; 71 double m_y;
72 OperationType m_type; 72 OperationType m_type;
73 }; 73 };
74 74
75 } // namespace WebCore 75 } // namespace WebCore
76 76
77 #endif // ScaleTransformOperation_h 77 #endif // ScaleTransformOperation_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698