OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. |
3 * Copyright (C) 2008, 2009 Google, Inc. | 3 * Copyright (C) 2008, 2009 Google, Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
72 m_bitmap.reset(); | 72 m_bitmap.reset(); |
73 m_status = FrameEmpty; | 73 m_status = FrameEmpty; |
74 // NOTE: Do not reset other members here; clearFrameBufferCache() | 74 // NOTE: Do not reset other members here; clearFrameBufferCache() |
75 // calls this to free the bitmap data, but other functions like | 75 // calls this to free the bitmap data, but other functions like |
76 // initFrameBuffer() and frameComplete() may still need to read | 76 // initFrameBuffer() and frameComplete() may still need to read |
77 // other metadata out of this frame later. | 77 // other metadata out of this frame later. |
78 } | 78 } |
79 | 79 |
80 void ImageFrame::zeroFillPixelData() { | 80 void ImageFrame::zeroFillPixelData() { |
81 m_bitmap.eraseARGB(0, 0, 0, 0); | 81 m_bitmap.eraseARGB(0, 0, 0, 0); |
82 m_hasAlpha = true; | |
83 } | 82 } |
84 | 83 |
85 bool ImageFrame::copyBitmapData(const ImageFrame& other) { | 84 bool ImageFrame::copyBitmapData(const ImageFrame& other) { |
86 DCHECK_NE(this, &other); | 85 DCHECK_NE(this, &other); |
87 m_hasAlpha = other.m_hasAlpha; | 86 m_hasAlpha = other.m_hasAlpha; |
88 m_bitmap.reset(); | 87 m_bitmap.reset(); |
89 return other.m_bitmap.copyTo(&m_bitmap, other.m_bitmap.colorType()); | 88 return other.m_bitmap.copyTo(&m_bitmap, other.m_bitmap.colorType()); |
90 } | 89 } |
91 | 90 |
92 bool ImageFrame::takeBitmapDataIfWritable(ImageFrame* other) { | 91 bool ImageFrame::takeBitmapDataIfWritable(ImageFrame* other) { |
(...skipping 11 matching lines...) Expand all Loading... | |
104 } | 103 } |
105 | 104 |
106 bool ImageFrame::allocatePixelData(int newWidth, | 105 bool ImageFrame::allocatePixelData(int newWidth, |
107 int newHeight, | 106 int newHeight, |
108 sk_sp<SkColorSpace> colorSpace) { | 107 sk_sp<SkColorSpace> colorSpace) { |
109 // allocatePixelData() should only be called once. | 108 // allocatePixelData() should only be called once. |
110 DCHECK(!width() && !height()); | 109 DCHECK(!width() && !height()); |
111 | 110 |
112 m_bitmap.setInfo(SkImageInfo::MakeN32( | 111 m_bitmap.setInfo(SkImageInfo::MakeN32( |
113 newWidth, newHeight, | 112 newWidth, newHeight, |
114 m_premultiplyAlpha ? kPremul_SkAlphaType : kUnpremul_SkAlphaType, | 113 m_premultiplyAlpha ? kPremul_SkAlphaType : kUnpremul_SkAlphaType, |
cblume
2017/03/20 22:40:28
I wonder if this line should change too.
Before c
Noel Gordon
2017/03/22 23:44:55
This came after my reply #8. Not sure why you'd w
| |
115 std::move(colorSpace))); | 114 std::move(colorSpace))); |
116 return m_bitmap.tryAllocPixels(m_allocator, 0); | 115 return m_bitmap.tryAllocPixels(m_allocator, 0); |
117 } | 116 } |
118 | 117 |
119 bool ImageFrame::hasAlpha() const { | 118 bool ImageFrame::hasAlpha() const { |
120 return m_hasAlpha; | 119 return m_hasAlpha; |
121 } | 120 } |
122 | 121 |
123 sk_sp<SkImage> ImageFrame::finalizePixelsAndGetImage() { | 122 sk_sp<SkImage> ImageFrame::finalizePixelsAndGetImage() { |
124 DCHECK_EQ(FrameComplete, m_status); | 123 DCHECK_EQ(FrameComplete, m_status); |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
202 // If the frame is not fully loaded, there will be transparent pixels, | 201 // If the frame is not fully loaded, there will be transparent pixels, |
203 // so we can't tell skia we're opaque, even for image types that logically | 202 // so we can't tell skia we're opaque, even for image types that logically |
204 // always are (e.g. jpeg). | 203 // always are (e.g. jpeg). |
205 if (!m_hasAlpha && m_status == FrameComplete) | 204 if (!m_hasAlpha && m_status == FrameComplete) |
206 return kOpaque_SkAlphaType; | 205 return kOpaque_SkAlphaType; |
207 | 206 |
208 return m_premultiplyAlpha ? kPremul_SkAlphaType : kUnpremul_SkAlphaType; | 207 return m_premultiplyAlpha ? kPremul_SkAlphaType : kUnpremul_SkAlphaType; |
209 } | 208 } |
210 | 209 |
211 } // namespace blink | 210 } // namespace blink |
OLD | NEW |