Move gif image decoder to SkCodec

third_party/WebKit/Source/platform/image-decoders/SegmentStream.cpp

+// Copyright (c) 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "platform/image-decoders/SegmentStream.h"
+#include <utility>
+
+namespace blink {
+
+SegmentStream::SegmentStream() = default;
+
+SegmentStream::SegmentStream(SegmentStream&& rhs)
+    : reader_(std::move(rhs.reader_)),
+      position_(rhs.position_),
+      has_read_all_contents_(rhs.has_read_all_contents_),
+      is_cleared_(rhs.is_cleared_) {}
+
+SegmentStream::~SegmentStream() = default;
+
+SegmentStream& SegmentStream::operator=(SegmentStream&& rhs) {
+  reader_ = std::move(rhs.reader_);
+  position_ = rhs.position_;
+  has_read_all_contents_ = rhs.has_read_all_contents_;
+  is_cleared_ = rhs.is_cleared_;
+
+  return *this;
+}
+
+void SegmentStream::SetReader(WTF::RefPtr<SegmentReader> reader) {
+  reader_ = std::move(reader);
+  SetPositionState(position_);
+}
+
+size_t SegmentStream::read(void* buffer, size_t size) {
+  if (is_cleared_)
+    return 0;
+
+  size = std::min(size, reader_->size() - position_);
+
+  size_t bytes_advanced = 0;
+  if (!buffer) {  // skipping, not reading
+    bytes_advanced = size;
+  } else {
+    bytes_advanced = peek(buffer, size);
+  }
+
+  SetPositionState(position_ + bytes_advanced);
+
+  return bytes_advanced;
+}
+
+size_t SegmentStream::peek(void* buffer, size_t size) const {
+  if (is_cleared_)
+    return 0;
+
+  size = std::min(size, reader_->size() - position_);
+
+  size_t total_bytes_peeked = 0;
+  char* buffer_as_char_ptr = reinterpret_cast<char*>(buffer);
+  while (size) {
+    const char* segment = nullptr;
+    size_t bytes_peeked =
+        reader_->GetSomeData(segment, position_ + total_bytes_peeked);
+    if (!bytes_peeked)
+      break;
+    if (bytes_peeked > size)
+      bytes_peeked = size;
+
+    memcpy(buffer_as_char_ptr, segment, bytes_peeked);
+    buffer_as_char_ptr += bytes_peeked;
+    size -= bytes_peeked;
+    total_bytes_peeked += bytes_peeked;
+  }
+
+  return total_bytes_peeked;
+}
+
+bool SegmentStream::rewind() {
+  SetPositionState(0);
+  return true;
+}
+
+bool SegmentStream::seek(size_t position) {
+  SetPositionState(position);
+  return true;
+}
+
+bool SegmentStream::move(long offset) {
+  DCHECK_GT(offset, 0);
+  SetPositionState(position_ + offset);
+  return true;
+}
+
+void SegmentStream::SetPositionState(size_t new_position) {
+  position_ = new_position;
+  if (reader_) {
+    const size_t reader_size = reader_->size();
+    has_read_all_contents_ = position_ >= reader_size;

[scroggo_chromium, 2017/08/15 15:19:44]

Instead of computing this value each time we change the position, why not
compute this once in isAtEnd?

  bool SegmentStream::isAtEnd() const {
    return !reader_ || position_ >= reader_->size();
  }

We can do the same for is_cleared_:

  bool SegmentStream::IsCleared() const {
    return !reader_ || position_ > reader_->size();
  }

Then we can drop SetPositionState, and set the position directly.

[cblume, 2017/08/15 18:03:33]

Done.

+    is_cleared_ = position_ > reader_size;
+  } else {
+    has_read_all_contents_ = true;
+    is_cleared_ = true;
+  }
+}
+
+}  // namespace blink