Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(755)

Side by Side Diff: Source/platform/graphics/DecodingImageGenerator.cpp

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 DecodingImageGenerator::~DecodingImageGenerator() 46 DecodingImageGenerator::~DecodingImageGenerator()
47 { 47 {
48 } 48 }
49 49
50 SkData* DecodingImageGenerator::refEncodedData() 50 SkData* DecodingImageGenerator::refEncodedData()
51 { 51 {
52 // FIXME: If the image has been clipped or scaled, do not return the origina l 52 // FIXME: If the image has been clipped or scaled, do not return the origina l
53 // encoded data, since on playback it will not be known how the clipping/sca ling 53 // encoded data, since on playback it will not be known how the clipping/sca ling
54 // was done. 54 // was done.
55 RefPtr<SharedBuffer> buffer = 0; 55 RefPtr<SharedBuffer> buffer = nullptr;
56 bool allDataReceived = false; 56 bool allDataReceived = false;
57 m_frameGenerator->copyData(&buffer, &allDataReceived); 57 m_frameGenerator->copyData(&buffer, &allDataReceived);
58 if (buffer && allDataReceived) { 58 if (buffer && allDataReceived) {
59 return SkData::NewWithCopy(buffer->data(), buffer->size()); 59 return SkData::NewWithCopy(buffer->data(), buffer->size());
60 } 60 }
61 return 0; 61 return 0;
62 } 62 }
63 63
64 bool DecodingImageGenerator::getInfo(SkImageInfo* info) 64 bool DecodingImageGenerator::getInfo(SkImageInfo* info)
65 { 65 {
(...skipping 11 matching lines...) Expand all
77 ASSERT(info.fHeight == m_imageInfo.fHeight); 77 ASSERT(info.fHeight == m_imageInfo.fHeight);
78 ASSERT(info.fColorType == m_imageInfo.fColorType); 78 ASSERT(info.fColorType == m_imageInfo.fColorType);
79 ASSERT(info.fAlphaType == m_imageInfo.fAlphaType); 79 ASSERT(info.fAlphaType == m_imageInfo.fAlphaType);
80 PlatformInstrumentation::willDecodeLazyPixelRef(m_generationId); 80 PlatformInstrumentation::willDecodeLazyPixelRef(m_generationId);
81 bool decoded = m_frameGenerator->decodeAndScale(m_imageInfo, m_frameIndex, p ixels, rowBytes); 81 bool decoded = m_frameGenerator->decodeAndScale(m_imageInfo, m_frameIndex, p ixels, rowBytes);
82 PlatformInstrumentation::didDecodeLazyPixelRef(m_generationId); 82 PlatformInstrumentation::didDecodeLazyPixelRef(m_generationId);
83 return decoded; 83 return decoded;
84 } 84 }
85 85
86 } // namespace blink 86 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/graphics/Canvas2DLayerBridge.cpp ('k') | Source/platform/graphics/FrameData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698