Move gif image decoder to SkCodec

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

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2008, 2009 Google, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 65 matching lines @@
 
 void ImageFrame::ZeroFillPixelData() {
   bitmap_.eraseARGB(0, 0, 0, 0);
   has_alpha_ = true;
 }
 
 bool ImageFrame::CopyBitmapData(const ImageFrame& other) {
   DCHECK_NE(this, &other);
   has_alpha_ = other.has_alpha_;
   bitmap_.reset();
+  bool copied = false;

[scroggo_chromium, 2017/06/05 19:00:53]

nit: My preference would be to drop this local variable, and instead do
something like

  if (!bitmap_.tryAllocPixels(info)) {
    return false;
  }

  status_ = kFrameAllocated;
  return other.bitmap_readPixels(...);

That seems simpler to me.

[cblume, 2017/06/06 04:04:35]

Done.

   SkImageInfo info = other.bitmap_.info();
-  return bitmap_.tryAllocPixels(info) &&
-         other.bitmap_.readPixels(info, bitmap_.getPixels(), bitmap_.rowBytes(),
-                                  0, 0);
+  if (bitmap_.tryAllocPixels(info)) {
+    status_ = kFrameAllocated;

[scroggo_chromium, 2017/06/05 19:00:53]

So if we fail in readPixels, we'll still have the kFrameAllocated status, but it
seems there's no way to differentiate that. I suppose it does not matter though;
if this returns false we'll SetFailed, so noone will care about that status.

[cblume, 2017/06/06 04:04:35]

Right.
At that point we *have* allocated (with tryAllocPixels).

+    copied = other.bitmap_.readPixels(info, bitmap_.getPixels(),
+                                      bitmap_.rowBytes(), 0, 0);
+  }
+
+  return copied;
 }
 
 bool ImageFrame::TakeBitmapDataIfWritable(ImageFrame* other) {
   DCHECK(other);
   DCHECK_EQ(kFrameComplete, other->status_);
   DCHECK_EQ(kFrameEmpty, status_);
   DCHECK_NE(this, other);
   if (other->bitmap_.isImmutable())
     return false;
   has_alpha_ = other->has_alpha_;
   bitmap_.reset();
   bitmap_.swap(other->bitmap_);
   other->status_ = kFrameEmpty;
+  status_ = kFrameAllocated;
   return true;
 }
 
 bool ImageFrame::AllocatePixelData(int new_width,
                                    int new_height,
                                    sk_sp<SkColorSpace> color_space) {
   // AllocatePixelData() should only be called once.
   DCHECK(!Width() && !Height());
 
   bitmap_.setInfo(SkImageInfo::MakeN32(
       new_width, new_height,
       premultiply_alpha_ ? kPremul_SkAlphaType : kUnpremul_SkAlphaType,
       std::move(color_space)));
-  return bitmap_.tryAllocPixels(allocator_, 0);
+  bool allocated = bitmap_.tryAllocPixels(allocator_, 0);
+  if (allocated)
+    status_ = kFrameAllocated;
+
+  return allocated;
 }
 
 bool ImageFrame::HasAlpha() const {
   return has_alpha_;
 }
 
 sk_sp<SkImage> ImageFrame::FinalizePixelsAndGetImage() {
   DCHECK_EQ(kFrameComplete, status_);
   bitmap_.setImmutable();
   return SkImage::MakeFromBitmap(bitmap_);
@@ skipping 75 matching lines @@
   // If the frame is not fully loaded, there will be transparent pixels,
   // so we can't tell skia we're opaque, even for image types that logically
   // always are (e.g. jpeg).
   if (!has_alpha_ && status_ == kFrameComplete)
     return kOpaque_SkAlphaType;
 
   return premultiply_alpha_ ? kPremul_SkAlphaType : kUnpremul_SkAlphaType;
 }
 
 }  // namespace blink