Index: third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp |
diff --git a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp |
index 5600cc13cc12c8c73fd6a7088e16eafc53bf2852..e75aa79055315a7be59bf42d695013d4ee449299 100644 |
--- a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp |
@@ -43,14 +43,14 @@ public: |
DeferredFrameData() |
: m_orientation(DefaultImageOrientation) |
, m_duration(0) |
- , m_isComplete(false) |
+ , m_isFullyReceived(false) |
, m_frameBytes(0) |
, m_uniqueID(DecodingImageGenerator::kNeedNewImageUniqueID) |
{} |
ImageOrientation m_orientation; |
float m_duration; |
- bool m_isComplete; |
+ bool m_isFullyReceived; |
size_t m_frameBytes; |
uint32_t m_uniqueID; |
}; |
@@ -193,12 +193,12 @@ bool DeferredImageDecoder::frameHasAlphaAtIndex(size_t index) const |
return true; |
} |
-bool DeferredImageDecoder::frameIsCompleteAtIndex(size_t index) const |
+bool DeferredImageDecoder::frameIsFullyReceivedAtIndex(size_t index) const |
{ |
if (m_actualDecoder) |
- return m_actualDecoder->frameIsCompleteAtIndex(index); |
+ return m_actualDecoder->frameIsFullyReceivedAtIndex(index); |
if (index < m_frameData.size()) |
- return m_frameData[index].m_isComplete; |
+ return m_frameData[index].m_isFullyReceived; |
return false; |
} |
@@ -264,14 +264,14 @@ void DeferredImageDecoder::prepareLazyDecodedFrames() |
for (size_t i = previousSize; i < m_frameData.size(); ++i) { |
m_frameData[i].m_duration = m_actualDecoder->frameDurationAtIndex(i); |
m_frameData[i].m_orientation = m_actualDecoder->orientation(); |
- m_frameData[i].m_isComplete = m_actualDecoder->frameIsCompleteAtIndex(i); |
+ m_frameData[i].m_isFullyReceived = m_actualDecoder->frameIsFullyReceivedAtIndex(i); |
} |
// The last lazy decoded frame created from previous call might be |
// incomplete so update its state. |
if (previousSize) { |
const size_t lastFrame = previousSize - 1; |
- m_frameData[lastFrame].m_isComplete = m_actualDecoder->frameIsCompleteAtIndex(lastFrame); |
+ m_frameData[lastFrame].m_isFullyReceived = m_actualDecoder->frameIsFullyReceivedAtIndex(lastFrame); |
} |
if (m_allDataReceived) { |
@@ -302,7 +302,7 @@ PassRefPtr<SkImage> DeferredImageDecoder::createFrameImageAtIndex(size_t index, |
// We can consider decoded bitmap constant and reuse uniqueID only after all |
// data is received. We reuse it also for multiframe images when image data |
// is partially received but the frame data is fully received. |
- if (m_allDataReceived || m_frameData[index].m_isComplete) { |
+ if (m_allDataReceived || m_frameData[index].m_isFullyReceived) { |
DCHECK(m_frameData[index].m_uniqueID == DecodingImageGenerator::kNeedNewImageUniqueID || m_frameData[index].m_uniqueID == image->uniqueID()); |
m_frameData[index].m_uniqueID = image->uniqueID(); |
} |