OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2013, Google Inc. All rights reserved. | 2 * Copyright (c) 2013, Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 11 matching lines...) Expand all Loading... | |
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "platform/graphics/UnacceleratedImageBufferSurface.h" | 32 #include "platform/graphics/UnacceleratedSimpleImageBufferSurface.h" |
33 | 33 |
34 #include "third_party/skia/include/core/SkCanvas.h" | 34 #include "third_party/skia/include/core/SkCanvas.h" |
35 #include "third_party/skia/include/core/SkDevice.h" | 35 #include "third_party/skia/include/core/SkDevice.h" |
36 #include "third_party/skia/include/core/SkSurface.h" | 36 #include "third_party/skia/include/core/SkSurface.h" |
37 #include "wtf/PassRefPtr.h" | 37 #include "wtf/PassRefPtr.h" |
38 | 38 |
39 namespace blink { | 39 namespace blink { |
40 | 40 |
41 UnacceleratedImageBufferSurface::UnacceleratedImageBufferSurface(const IntSize& size, OpacityMode opacityMode) | 41 UnacceleratedSimpleImageBufferSurface::UnacceleratedSimpleImageBufferSurface(con st IntSize& size, OpacityMode opacityMode) |
42 : ImageBufferSurface(size, opacityMode) | 42 : ImageBufferSurface(size, opacityMode) |
43 { | 43 { |
44 SkAlphaType alphaType = (Opaque == opacityMode) ? kOpaque_SkAlphaType : kPre mul_SkAlphaType; | 44 SkAlphaType alphaType = (Opaque == opacityMode) ? kOpaque_SkAlphaType : kPre mul_SkAlphaType; |
45 SkImageInfo info = SkImageInfo::MakeN32(size.width(), size.height(), alphaTy pe); | 45 SkImageInfo info = SkImageInfo::MakeN32(size.width(), size.height(), alphaTy pe); |
46 SkSurfaceProps disableLCDProps(0, kUnknown_SkPixelGeometry); | 46 SkSurfaceProps disableLCDProps(0, kUnknown_SkPixelGeometry); |
47 m_surface = adoptRef(SkSurface::NewRaster(info, Opaque == opacityMode ? 0 : &disableLCDProps)); | 47 m_surface = adoptRef(SkSurface::NewRaster(info, Opaque == opacityMode ? 0 : &disableLCDProps)); |
48 | |
49 if (m_surface) | |
50 clear(); | |
Justin Novosad
2015/10/03 03:22:55
This is too small of a difference to justify creat
| |
51 } | 48 } |
52 | 49 |
53 UnacceleratedImageBufferSurface::~UnacceleratedImageBufferSurface() { } | 50 UnacceleratedSimpleImageBufferSurface::~UnacceleratedSimpleImageBufferSurface() { } |
54 | 51 |
55 SkCanvas* UnacceleratedImageBufferSurface::canvas() | 52 SkCanvas* UnacceleratedSimpleImageBufferSurface::canvas() |
56 { | 53 { |
57 return m_surface->getCanvas(); | 54 return m_surface->getCanvas(); |
58 } | 55 } |
59 | 56 |
60 const SkBitmap& UnacceleratedImageBufferSurface::deprecatedBitmapForOverwrite() | 57 const SkBitmap& UnacceleratedSimpleImageBufferSurface::deprecatedBitmapForOverwr ite() |
61 { | 58 { |
62 m_surface->notifyContentWillChange(SkSurface::kDiscard_ContentChangeMode); | 59 m_surface->notifyContentWillChange(SkSurface::kDiscard_ContentChangeMode); |
63 return m_surface->getCanvas()->getDevice()->accessBitmap(false); | 60 return m_surface->getCanvas()->getDevice()->accessBitmap(false); |
64 } | 61 } |
65 | 62 |
66 bool UnacceleratedImageBufferSurface::isValid() const | 63 bool UnacceleratedSimpleImageBufferSurface::isValid() const |
67 { | 64 { |
68 return m_surface; | 65 return m_surface; |
69 } | 66 } |
70 | 67 |
71 PassRefPtr<SkImage> UnacceleratedImageBufferSurface::newImageSnapshot(Accelerati onHint) | 68 PassRefPtr<SkImage> UnacceleratedSimpleImageBufferSurface::newImageSnapshot(Acce lerationHint) |
72 { | 69 { |
73 return adoptRef(m_surface->newImageSnapshot()); | 70 return adoptRef(m_surface->newImageSnapshot()); |
74 } | 71 } |
75 | 72 |
76 } // namespace blink | 73 } // namespace blink |
OLD | NEW |