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 20 matching lines...) Expand all Loading... | |
31 #include "config.h" | 31 #include "config.h" |
32 #include "platform/graphics/UnacceleratedImageBufferSurface.h" | 32 #include "platform/graphics/UnacceleratedImageBufferSurface.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 UnacceleratedImageBufferSurface::UnacceleratedImageBufferSurface(const IntSize& size, OpacityMode opacityMode, ImageInitializationMode initializationMode) |
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 | 48 |
49 if (m_surface) | 49 if (initializationMode == DoNotInitializeImagePixels) { |
rickyz (no longer on Chrome)
2016/01/19 23:34:49
Is this logic correct? Shouldn't this clear initia
rickyz (no longer on Chrome)
2016/01/19 23:43:10
Never mind, I see that this was fixed in a later C
| |
50 clear(); | 50 if (m_surface) |
51 clear(); | |
52 } | |
51 } | 53 } |
52 | 54 |
53 UnacceleratedImageBufferSurface::~UnacceleratedImageBufferSurface() { } | 55 UnacceleratedImageBufferSurface::~UnacceleratedImageBufferSurface() { } |
54 | 56 |
55 SkCanvas* UnacceleratedImageBufferSurface::canvas() | 57 SkCanvas* UnacceleratedImageBufferSurface::canvas() |
56 { | 58 { |
57 return m_surface->getCanvas(); | 59 return m_surface->getCanvas(); |
58 } | 60 } |
59 | 61 |
60 const SkBitmap& UnacceleratedImageBufferSurface::deprecatedBitmapForOverwrite() | 62 const SkBitmap& UnacceleratedImageBufferSurface::deprecatedBitmapForOverwrite() |
61 { | 63 { |
62 m_surface->notifyContentWillChange(SkSurface::kDiscard_ContentChangeMode); | 64 m_surface->notifyContentWillChange(SkSurface::kDiscard_ContentChangeMode); |
63 return m_surface->getCanvas()->getDevice()->accessBitmap(false); | 65 return m_surface->getCanvas()->getDevice()->accessBitmap(false); |
64 } | 66 } |
65 | 67 |
66 bool UnacceleratedImageBufferSurface::isValid() const | 68 bool UnacceleratedImageBufferSurface::isValid() const |
67 { | 69 { |
68 return m_surface; | 70 return m_surface; |
69 } | 71 } |
70 | 72 |
71 PassRefPtr<SkImage> UnacceleratedImageBufferSurface::newImageSnapshot(Accelerati onHint) | 73 PassRefPtr<SkImage> UnacceleratedImageBufferSurface::newImageSnapshot(Accelerati onHint) |
72 { | 74 { |
73 return adoptRef(m_surface->newImageSnapshot()); | 75 return adoptRef(m_surface->newImageSnapshot()); |
74 } | 76 } |
75 | 77 |
76 } // namespace blink | 78 } // namespace blink |
OLD | NEW |