OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "gfx/skia_util.h" | 5 #include "ui/gfx/skia_util.h" |
6 | 6 |
7 #include "gfx/rect.h" | |
8 #include "third_party/skia/include/core/SkBitmap.h" | 7 #include "third_party/skia/include/core/SkBitmap.h" |
9 #include "third_party/skia/include/core/SkColorPriv.h" | 8 #include "third_party/skia/include/core/SkColorPriv.h" |
10 #include "third_party/skia/include/core/SkShader.h" | 9 #include "third_party/skia/include/core/SkShader.h" |
11 #include "third_party/skia/include/effects/SkGradientShader.h" | 10 #include "third_party/skia/include/effects/SkGradientShader.h" |
| 11 #include "ui/gfx/rect.h" |
12 | 12 |
13 namespace gfx { | 13 namespace gfx { |
14 | 14 |
15 SkRect RectToSkRect(const gfx::Rect& rect) { | 15 SkRect RectToSkRect(const gfx::Rect& rect) { |
16 SkRect r; | 16 SkRect r; |
17 r.set(SkIntToScalar(rect.x()), SkIntToScalar(rect.y()), | 17 r.set(SkIntToScalar(rect.x()), SkIntToScalar(rect.y()), |
18 SkIntToScalar(rect.right()), SkIntToScalar(rect.bottom())); | 18 SkIntToScalar(rect.right()), SkIntToScalar(rect.bottom())); |
19 return r; | 19 return r; |
20 } | 20 } |
21 | 21 |
(...skipping 30 matching lines...) Expand all Loading... |
52 | 52 |
53 bitmap2.lockPixels(); | 53 bitmap2.lockPixels(); |
54 addr2 = bitmap2.getAddr32(0, 0); | 54 addr2 = bitmap2.getAddr32(0, 0); |
55 size2 = bitmap2.getSize(); | 55 size2 = bitmap2.getSize(); |
56 bitmap2.unlockPixels(); | 56 bitmap2.unlockPixels(); |
57 | 57 |
58 return (size1 == size2) && (0 == memcmp(addr1, addr2, bitmap1.getSize())); | 58 return (size1 == size2) && (0 == memcmp(addr1, addr2, bitmap1.getSize())); |
59 } | 59 } |
60 | 60 |
61 } // namespace gfx | 61 } // namespace gfx |
OLD | NEW |