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

Side by Side Diff: third_party/WebKit/Source/platform/image-decoders/SegmentReader.cpp

Issue 2290903002: Change (Pass)RefPtr<SkXxx> into sk_sp<SkXxx>. (Closed)
Patch Set: Rebasing... Created 4 years, 3 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "platform/image-decoders/SegmentReader.h" 5 #include "platform/image-decoders/SegmentReader.h"
6 6
7 #include "platform/SharedBuffer.h" 7 #include "platform/SharedBuffer.h"
8 #include "third_party/skia/include/core/SkData.h" 8 #include "third_party/skia/include/core/SkData.h"
9 #include "wtf/Assertions.h" 9 #include "wtf/Assertions.h"
10 #include "wtf/Noncopyable.h" 10 #include "wtf/Noncopyable.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 sk_sp<SkData> DataSegmentReader::getAsSkData() const 80 sk_sp<SkData> DataSegmentReader::getAsSkData() const
81 { 81 {
82 return m_data; 82 return m_data;
83 } 83 }
84 84
85 // ROBufferSegmentReader ------------------------------------------------------- 85 // ROBufferSegmentReader -------------------------------------------------------
86 86
87 class ROBufferSegmentReader final : public SegmentReader { 87 class ROBufferSegmentReader final : public SegmentReader {
88 WTF_MAKE_NONCOPYABLE(ROBufferSegmentReader); 88 WTF_MAKE_NONCOPYABLE(ROBufferSegmentReader);
89 public: 89 public:
90 ROBufferSegmentReader(PassRefPtr<SkROBuffer>); 90 ROBufferSegmentReader(sk_sp<SkROBuffer>);
91 91
92 size_t size() const override; 92 size_t size() const override;
93 size_t getSomeData(const char*& data, size_t position) const override; 93 size_t getSomeData(const char*& data, size_t position) const override;
94 sk_sp<SkData> getAsSkData() const override; 94 sk_sp<SkData> getAsSkData() const override;
95 95
96 private: 96 private:
97 RefPtr<SkROBuffer> m_roBuffer; 97 sk_sp<SkROBuffer> m_roBuffer;
98 // Protects access to mutable fields. 98 // Protects access to mutable fields.
99 mutable Mutex m_readMutex; 99 mutable Mutex m_readMutex;
100 // Position of the first char in the current block of m_iter. 100 // Position of the first char in the current block of m_iter.
101 mutable size_t m_positionOfBlock; 101 mutable size_t m_positionOfBlock;
102 mutable SkROBuffer::Iter m_iter; 102 mutable SkROBuffer::Iter m_iter;
103 }; 103 };
104 104
105 ROBufferSegmentReader::ROBufferSegmentReader(PassRefPtr<SkROBuffer> buffer) 105 ROBufferSegmentReader::ROBufferSegmentReader(sk_sp<SkROBuffer> buffer)
106 : m_roBuffer(buffer) 106 : m_roBuffer(std::move(buffer))
107 , m_positionOfBlock(0) 107 , m_positionOfBlock(0)
108 , m_iter(m_roBuffer.get()) 108 , m_iter(m_roBuffer.get())
109 {} 109 {}
110 110
111 size_t ROBufferSegmentReader::size() const 111 size_t ROBufferSegmentReader::size() const
112 { 112 {
113 return m_roBuffer ? m_roBuffer->size() : 0; 113 return m_roBuffer ? m_roBuffer->size() : 0;
114 } 114 }
115 115
116 size_t ROBufferSegmentReader::getSomeData(const char*& data, size_t position) co nst 116 size_t ROBufferSegmentReader::getSomeData(const char*& data, size_t position) co nst
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 PassRefPtr<SegmentReader> SegmentReader::createFromSharedBuffer(PassRefPtr<Share dBuffer> buffer) 184 PassRefPtr<SegmentReader> SegmentReader::createFromSharedBuffer(PassRefPtr<Share dBuffer> buffer)
185 { 185 {
186 return adoptRef(new SharedBufferSegmentReader(buffer)); 186 return adoptRef(new SharedBufferSegmentReader(buffer));
187 } 187 }
188 188
189 PassRefPtr<SegmentReader> SegmentReader::createFromSkData(sk_sp<SkData> data) 189 PassRefPtr<SegmentReader> SegmentReader::createFromSkData(sk_sp<SkData> data)
190 { 190 {
191 return adoptRef(new DataSegmentReader(std::move(data))); 191 return adoptRef(new DataSegmentReader(std::move(data)));
192 } 192 }
193 193
194 PassRefPtr<SegmentReader> SegmentReader::createFromSkROBuffer(PassRefPtr<SkROBuf fer> buffer) 194 PassRefPtr<SegmentReader> SegmentReader::createFromSkROBuffer(sk_sp<SkROBuffer> buffer)
195 { 195 {
196 return adoptRef(new ROBufferSegmentReader(buffer)); 196 return adoptRef(new ROBufferSegmentReader(std::move(buffer)));
197 } 197 }
198 198
199 } // namespace blink 199 } // namespace blink
200 200
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698