diff options
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/SkFrontBufferedStream.cpp | 26 | ||||
-rw-r--r-- | src/utils/win/SkDWriteFontFileStream.cpp | 14 | ||||
-rw-r--r-- | src/utils/win/SkDWriteFontFileStream.h | 20 |
3 files changed, 13 insertions, 47 deletions
diff --git a/src/utils/SkFrontBufferedStream.cpp b/src/utils/SkFrontBufferedStream.cpp index 77c484af64..42b86f09e3 100644 --- a/src/utils/SkFrontBufferedStream.cpp +++ b/src/utils/SkFrontBufferedStream.cpp @@ -11,8 +11,8 @@ class FrontBufferedStream : public SkStreamRewindable { public: - // Called by Make. - FrontBufferedStream(std::unique_ptr<SkStream>, size_t bufferSize); + // Called by Create. + FrontBufferedStream(SkStream*, size_t bufferSize); size_t read(void* buffer, size_t size) override; @@ -26,15 +26,9 @@ public: size_t getLength() const override { return fLength; } -#ifdef SK_SUPPORT_LEGACY_STREAM_API SkStreamRewindable* duplicate() const override { return nullptr; } -#endif private: -#ifndef SK_SUPPORT_LEGACY_STREAM_API - SkStreamRewindable* onDuplicate() const override { return nullptr; } -#endif - std::unique_ptr<SkStream> fStream; const bool fHasLength; const size_t fLength; @@ -67,19 +61,17 @@ private: typedef SkStream INHERITED; }; -std::unique_ptr<SkStreamRewindable> SkFrontBufferedStream::Make(std::unique_ptr<SkStream> stream, - size_t bufferSize) { - if (!stream) { +SkStreamRewindable* SkFrontBufferedStream::Create(SkStream* stream, size_t bufferSize) { + if (nullptr == stream) { return nullptr; } - return std::unique_ptr<SkStreamRewindable>(new FrontBufferedStream(std::move(stream), - bufferSize)); + return new FrontBufferedStream(stream, bufferSize); } -FrontBufferedStream::FrontBufferedStream(std::unique_ptr<SkStream> stream, size_t bufferSize) - : fStream(std::move(stream)) - , fHasLength(fStream->hasPosition() && fStream->hasLength()) - , fLength(fStream->getLength() - fStream->getPosition()) +FrontBufferedStream::FrontBufferedStream(SkStream* stream, size_t bufferSize) + : fStream(stream) + , fHasLength(stream->hasPosition() && stream->hasLength()) + , fLength(stream->getLength() - stream->getPosition()) , fOffset(0) , fBufferedSoFar(0) , fBufferSize(bufferSize) diff --git a/src/utils/win/SkDWriteFontFileStream.cpp b/src/utils/win/SkDWriteFontFileStream.cpp index a43e163481..2bb7d0fb4e 100644 --- a/src/utils/win/SkDWriteFontFileStream.cpp +++ b/src/utils/win/SkDWriteFontFileStream.cpp @@ -86,12 +86,7 @@ bool SkDWriteFontFileStream::rewind() { return true; } -#ifdef SK_SUPPORT_LEGACY_STREAM_API -SkDWriteFontFileStream* SkDWriteFontFileStream::duplicate() const -#else -SkDWriteFontFileStream* SkDWriteFontFileStream::onDuplicate() const -#endif -{ +SkDWriteFontFileStream* SkDWriteFontFileStream::duplicate() const { return new SkDWriteFontFileStream(fFontFileStream.get()); } @@ -109,12 +104,7 @@ bool SkDWriteFontFileStream::move(long offset) { return seek(fPos + offset); } -#ifdef SK_SUPPORT_LEGACY_STREAM_API -SkDWriteFontFileStream* SkDWriteFontFileStream::fork() const -#else -SkDWriteFontFileStream* SkDWriteFontFileStream::onFork() const -#endif -{ +SkDWriteFontFileStream* SkDWriteFontFileStream::fork() const { std::unique_ptr<SkDWriteFontFileStream> that(this->duplicate()); that->seek(fPos); return that.release(); diff --git a/src/utils/win/SkDWriteFontFileStream.h b/src/utils/win/SkDWriteFontFileStream.h index 9b65752382..25322c5657 100644 --- a/src/utils/win/SkDWriteFontFileStream.h +++ b/src/utils/win/SkDWriteFontFileStream.h @@ -28,31 +28,15 @@ public: size_t read(void* buffer, size_t size) override; bool isAtEnd() const override; bool rewind() override; + SkDWriteFontFileStream* duplicate() const override; size_t getPosition() const override; bool seek(size_t position) override; bool move(long offset) override; + SkDWriteFontFileStream* fork() const override; size_t getLength() const override; const void* getMemoryBase() override; -#ifdef SK_SUPPORT_LEGACY_STREAM_API - SkDWriteFontFileStream* duplicate() const override; - SkDWriteFontFileStream* fork() const override; -#else - std::unique_ptr<SkDWriteFontFileStream> duplicate() const { - return std::unique_ptr<SkDWriteFontFileStream>(this->onDuplicate()); - } - std::unique_ptr<SkDWriteFontFileStream> fork() const { - return std::unique_ptr<SkDWriteFontFileStream>(this->onFork()); - } -#endif - - private: -#ifndef SK_SUPPORT_LEGACY_STREAM_API - SkDWriteFontFileStream* onDuplicate() const override; - SkDWriteFontFileStream* onFork() const override; -#endif - SkTScopedComPtr<IDWriteFontFileStream> fFontFileStream; size_t fPos; const void* fLockedMemory; |