| Index: third_party/WebKit/Source/platform/image-decoders/FastSharedBufferReaderTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/image-decoders/FastSharedBufferReaderTest.cpp b/third_party/WebKit/Source/platform/image-decoders/FastSharedBufferReaderTest.cpp
|
| index 3ea9aa0300bc6dd4d3d38fe71a80f148f303e972..2a29ef0c8c488f4b9f32fa4ced9ae9057b86b494 100644
|
| --- a/third_party/WebKit/Source/platform/image-decoders/FastSharedBufferReaderTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/image-decoders/FastSharedBufferReaderTest.cpp
|
| @@ -29,6 +29,7 @@
|
| */
|
|
|
| #include "platform/image-decoders/FastSharedBufferReader.h"
|
| +#include "platform/image-decoders/SharedBufferSegmentReader.h"
|
|
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -53,7 +54,8 @@ TEST(FastSharedBufferReaderTest, nonSequentialReads)
|
| RefPtr<SharedBuffer> data = SharedBuffer::create();
|
| data->append(referenceData, sizeof(referenceData));
|
|
|
| - FastSharedBufferReader reader(data);
|
| + RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
|
| + FastSharedBufferReader reader(segmentReader.release());
|
|
|
| // Read size is prime such there will be a segment-spanning
|
| // read eventually.
|
| @@ -72,7 +74,8 @@ TEST(FastSharedBufferReaderTest, readBackwards)
|
| RefPtr<SharedBuffer> data = SharedBuffer::create();
|
| data->append(referenceData, sizeof(referenceData));
|
|
|
| - FastSharedBufferReader reader(data);
|
| + RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
|
| + FastSharedBufferReader reader(segmentReader.release());
|
|
|
| // Read size is prime such there will be a segment-spanning
|
| // read eventually.
|
| @@ -91,7 +94,8 @@ TEST(FastSharedBufferReaderTest, byteByByte)
|
| RefPtr<SharedBuffer> data = SharedBuffer::create();
|
| data->append(referenceData, sizeof(referenceData));
|
|
|
| - FastSharedBufferReader reader(data);
|
| + RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
|
| + FastSharedBufferReader reader(segmentReader.release());
|
| for (size_t i = 0; i < sizeof(referenceData); ++i) {
|
| ASSERT_EQ(referenceData[i], reader.getOneByte(i));
|
| }
|
| @@ -107,8 +111,9 @@ TEST(FastSharedBufferReaderTest, readAllOverlappingLastSegmentBoundary)
|
| RefPtr<SharedBuffer> data = SharedBuffer::create();
|
| data->append(referenceData, dataSize);
|
|
|
| + RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
|
| char buffer[dataSize];
|
| - FastSharedBufferReader reader(data);
|
| + FastSharedBufferReader reader(segmentReader.release());
|
| reader.getConsecutiveData(0, dataSize, buffer);
|
|
|
| ASSERT_FALSE(memcmp(buffer, referenceData, dataSize));
|
|
|