OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "platform/graphics/ImagePattern.h" | 5 #include "platform/graphics/ImagePattern.h" |
6 | 6 |
7 #include "platform/graphics/Image.h" | 7 #include "platform/graphics/Image.h" |
8 #include "platform/graphics/skia/SkiaUtils.h" | 8 #include "platform/graphics/skia/SkiaUtils.h" |
9 #include "third_party/skia/include/core/SkCanvas.h" | 9 #include "third_party/skia/include/core/SkCanvas.h" |
10 #include "third_party/skia/include/core/SkImage.h" | 10 #include "third_party/skia/include/core/SkImage.h" |
11 #include "third_party/skia/include/core/SkShader.h" | 11 #include "third_party/skia/include/core/SkShader.h" |
12 #include "third_party/skia/include/core/SkSurface.h" | 12 #include "third_party/skia/include/core/SkSurface.h" |
13 | 13 |
14 namespace blink { | 14 namespace blink { |
15 | 15 |
16 PassRefPtr<ImagePattern> ImagePattern::create(PassRefPtr<Image> image, | 16 PassRefPtr<ImagePattern> ImagePattern::create(PassRefPtr<Image> image, |
17 RepeatMode repeatMode) { | 17 RepeatMode repeatMode) { |
18 return adoptRef(new ImagePattern(std::move(image), repeatMode)); | 18 return adoptRef(new ImagePattern(std::move(image), repeatMode)); |
19 } | 19 } |
20 | 20 |
| 21 // TODO(ccameron): ImagePattern should not draw to a globally set color space. |
| 22 // https://crbug.com/672306 |
21 ImagePattern::ImagePattern(PassRefPtr<Image> image, RepeatMode repeatMode) | 23 ImagePattern::ImagePattern(PassRefPtr<Image> image, RepeatMode repeatMode) |
22 : Pattern(repeatMode), m_tileImage(image->imageForCurrentFrame()) { | 24 : Pattern(repeatMode), |
| 25 m_tileImage(image->imageForCurrentFrame( |
| 26 ColorBehavior::transformToGlobalTarget())) { |
23 m_previousLocalMatrix.setIdentity(); | 27 m_previousLocalMatrix.setIdentity(); |
24 if (m_tileImage) { | 28 if (m_tileImage) { |
25 // TODO(fmalita): mechanism to extract the actual SkImageInfo from an | 29 // TODO(fmalita): mechanism to extract the actual SkImageInfo from an |
26 // SkImage? | 30 // SkImage? |
27 const SkImageInfo info = SkImageInfo::MakeN32Premul( | 31 const SkImageInfo info = SkImageInfo::MakeN32Premul( |
28 m_tileImage->width() + (isRepeatX() ? 0 : 2), | 32 m_tileImage->width() + (isRepeatX() ? 0 : 2), |
29 m_tileImage->height() + (isRepeatY() ? 0 : 2)); | 33 m_tileImage->height() + (isRepeatY() ? 0 : 2)); |
30 adjustExternalMemoryAllocated(info.getSafeSize(info.minRowBytes())); | 34 adjustExternalMemoryAllocated(info.getSafeSize(info.minRowBytes())); |
31 } | 35 } |
32 } | 36 } |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 | 83 |
80 return surface->makeImageSnapshot()->makeShader(tileModeX, tileModeY, | 84 return surface->makeImageSnapshot()->makeShader(tileModeX, tileModeY, |
81 &adjustedMatrix); | 85 &adjustedMatrix); |
82 } | 86 } |
83 | 87 |
84 bool ImagePattern::isTextureBacked() const { | 88 bool ImagePattern::isTextureBacked() const { |
85 return m_tileImage && m_tileImage->isTextureBacked(); | 89 return m_tileImage && m_tileImage->isTextureBacked(); |
86 } | 90 } |
87 | 91 |
88 } // namespace blink | 92 } // namespace blink |
OLD | NEW |