Chromium Code Reviews| Index: third_party/WebKit/Source/platform/image-decoders/SegmentReader.cpp |
| diff --git a/third_party/WebKit/Source/platform/image-decoders/SegmentReader.cpp b/third_party/WebKit/Source/platform/image-decoders/SegmentReader.cpp |
| index 89ac6d7432833c05e52138338c3476cfc4399c0c..4ab188eccb65614c4db1b6c218155316fe71f9b1 100644 |
| --- a/third_party/WebKit/Source/platform/image-decoders/SegmentReader.cpp |
| +++ b/third_party/WebKit/Source/platform/image-decoders/SegmentReader.cpp |
| @@ -87,14 +87,14 @@ sk_sp<SkData> DataSegmentReader::getAsSkData() const |
| class ROBufferSegmentReader final : public SegmentReader { |
| WTF_MAKE_NONCOPYABLE(ROBufferSegmentReader); |
| public: |
| - ROBufferSegmentReader(PassRefPtr<SkROBuffer>); |
| + ROBufferSegmentReader(sk_sp<SkROBuffer>); |
| size_t size() const override; |
| size_t getSomeData(const char*& data, size_t position) const override; |
| sk_sp<SkData> getAsSkData() const override; |
| private: |
| - RefPtr<SkROBuffer> m_roBuffer; |
| + sk_sp<SkROBuffer> m_roBuffer; |
| // Protects access to mutable fields. |
| mutable Mutex m_readMutex; |
| // Position of the first char in the current block of m_iter. |
| @@ -102,7 +102,7 @@ private: |
| mutable SkROBuffer::Iter m_iter; |
| }; |
| -ROBufferSegmentReader::ROBufferSegmentReader(PassRefPtr<SkROBuffer> buffer) |
| +ROBufferSegmentReader::ROBufferSegmentReader(sk_sp<SkROBuffer> buffer) |
| : m_roBuffer(buffer) |
|
f(malita)
2016/09/01 03:55:39
std::move(buffer)
Łukasz Anforowicz
2016/09/01 20:50:58
Done.
|
| , m_positionOfBlock(0) |
| , m_iter(m_roBuffer.get()) |
| @@ -191,7 +191,7 @@ PassRefPtr<SegmentReader> SegmentReader::createFromSkData(sk_sp<SkData> data) |
| return adoptRef(new DataSegmentReader(std::move(data))); |
| } |
| -PassRefPtr<SegmentReader> SegmentReader::createFromSkROBuffer(PassRefPtr<SkROBuffer> buffer) |
| +PassRefPtr<SegmentReader> SegmentReader::createFromSkROBuffer(sk_sp<SkROBuffer> buffer) |
| { |
| return adoptRef(new ROBufferSegmentReader(buffer)); |
|
f(malita)
2016/09/01 03:55:39
std::move(buffer)
Łukasz Anforowicz
2016/09/01 20:50:58
Done.
|
| } |