Reland change to enable deferred image decoding for animated GIFs

Reland change to enable deferred image decoding for animated GIFs

TBR=gavinp@chromium.org

BUG=169377, 259786, 259783
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=154587

[commit-bot: I haz the power, 2013-07-19 19:47:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/hclam@chromium.org/19838002/1

[commit-bot: I haz the power, 2013-07-20 01:30:46]

Retried try job too often on win_blink_rel for step(s) webkit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_blink_...

[commit-bot: I haz the power, 2013-07-20 01:55:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/hclam@chromium.org/19838002/1

[commit-bot: I haz the power, 2013-07-20 01:55:24]

Failed to apply patch for
Source/core/platform/graphics/chromium/LazyDecodingPixelRef.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/platform/graphics/chromium/LazyDecodingPixelRef.h
  Hunk #1 FAILED at 34.
  Hunk #2 succeeded at 46 (offset -1 lines).
  Hunk #3 succeeded at 72 (offset -1 lines).
  1 out of 3 hunks FAILED -- saving rejects to file
Source/core/platform/graphics/chromium/LazyDecodingPixelRef.h.rej

Patch:       Source/core/platform/graphics/chromium/LazyDecodingPixelRef.h
Index: Source/core/platform/graphics/chromium/LazyDecodingPixelRef.h
diff --git a/Source/core/platform/graphics/chromium/LazyDecodingPixelRef.h
b/Source/core/platform/graphics/chromium/LazyDecodingPixelRef.h
index
a455c21719ae5c7cbf632ce7ca1ac8edae4f8c37..a473f475bf64b25af3ec181970de4a16612849a4
100644
--- a/Source/core/platform/graphics/chromium/LazyDecodingPixelRef.h
+++ b/Source/core/platform/graphics/chromium/LazyDecodingPixelRef.h
@@ -34,7 +34,6 @@
 #include "skia/ext/lazy_pixel_ref.h"
 
 #include <wtf/RefPtr.h>
-#include <wtf/ThreadingPrimitives.h>
 
 using skia::LazyPixelRef;
 
@@ -47,12 +46,13 @@ class ScaledImageFragment;
 
 class LazyDecodingPixelRef : public LazyPixelRef {
 public:
-    LazyDecodingPixelRef(PassRefPtr<ImageFrameGenerator>, const SkISize&
scaledSize, const SkIRect& scaledSubset);
+    LazyDecodingPixelRef(PassRefPtr<ImageFrameGenerator>, const SkISize&
scaledSize, size_t index, const SkIRect& scaledSubset);
     virtual ~LazyDecodingPixelRef();
 
     SK_DECLARE_UNFLATTENABLE_OBJECT()
 
     PassRefPtr<ImageFrameGenerator> frameGenerator() const { return
m_frameGenerator; }
+    size_t frameIndex() const { return m_frameIndex; }
     bool isScaled(const SkISize& fullSize) const;
     bool isClipped() const;
 
@@ -72,11 +72,11 @@ protected:
 
 private:
     RefPtr<ImageFrameGenerator> m_frameGenerator;
+    size_t m_frameIndex;
     SkISize m_scaledSize;
     SkIRect m_scaledSubset;
 
     const ScaledImageFragment* m_lockedCachedImage;
-    Mutex m_mutex;
 };
 
 } // namespace WebCore

[Alpha Left Google, 2013-07-20 02:03:39]

Committed patchset #2 manually as r154587 (presubmit successful).