OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 return false; | 98 return false; |
99 return frameBuffer->getStatus() == ImageFrame::FrameComplete; | 99 return frameBuffer->getStatus() == ImageFrame::FrameComplete; |
100 } | 100 } |
101 | 101 |
102 WebImage WebImageDecoder::getFrameAtIndex(int index = 0) const | 102 WebImage WebImageDecoder::getFrameAtIndex(int index = 0) const |
103 { | 103 { |
104 DCHECK(m_private); | 104 DCHECK(m_private); |
105 ImageFrame* const frameBuffer = m_private->frameBufferAtIndex(index); | 105 ImageFrame* const frameBuffer = m_private->frameBufferAtIndex(index); |
106 if (!frameBuffer) | 106 if (!frameBuffer) |
107 return WebImage(); | 107 return WebImage(); |
108 return WebImage(frameBuffer->bitmap()); | 108 SkBitmap bitmap = frameBuffer->bitmap(); |
| 109 if (frameBuffer->getStatus() == ImageFrame::FrameComplete) |
| 110 bitmap.setImmutable(); |
| 111 return WebImage(bitmap); |
109 } | 112 } |
110 | 113 |
111 } // namespace blink | 114 } // namespace blink |
OLD | NEW |