Drawing an animated image to a canvas now behave as expected

Source/core/html/canvas/CanvasRenderingContext2D.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
@@ skipping 43 matching lines @@
 #include "core/html/TextMetrics.h"
 #include "core/html/canvas/CanvasGradient.h"
 #include "core/html/canvas/CanvasPattern.h"
 #include "core/html/canvas/CanvasStyle.h"
 #include "core/html/canvas/Path2D.h"
 #include "core/rendering/RenderImage.h"
 #include "core/rendering/RenderLayer.h"
 #include "core/rendering/RenderTheme.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/geometry/FloatQuad.h"
+#include "platform/graphics/BitmapImage.h"
 #include "platform/graphics/DrawLooperBuilder.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
 #include "platform/text/TextRun.h"
 #include "wtf/CheckedArithmetic.h"
 #include "wtf/MathExtras.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/Uint8ClampedArray.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace WebCore {
@@ skipping 1427 matching lines @@
     FloatRect srcRect = normalizeRect(FloatRect(sx, sy, sw, sh));
     FloatRect dstRect = normalizeRect(FloatRect(dx, dy, dw, dh));
 
     clipRectsToImageRect(FloatRect(FloatPoint(), imageSource->sourceSize()), &srcRect, &dstRect);
 
     imageSource->adjustDrawRects(&srcRect, &dstRect);
 
     if (srcRect.isEmpty())
         return;
 
+    if (image->isBitmapImage() && image->maybeAnimated())
+        image = BitmapImage::create(static_cast<BitmapImage*>(image.get())->frameAtIndex(0));

[Justin Novosad, 2014/07/16 19:36:02]

Would be cleaner to put this logic inside BitmapImage.  You could add to
WebCore::Image a virtual method called imageForDefaultFrame. The default
implementation would just return 'this' and the override in BitmapImage would do
what you have here.

[Rémi Piotaix, 2014/07/17 17:38:20]

Done.

+
     FloatRect dirtyRect = clipBounds;
     if (imageSource->isVideoElement()) {
         drawVideo(static_cast<HTMLVideoElement*>(imageSource), srcRect, dstRect);
         computeDirtyRect(dstRect, clipBounds, &dirtyRect);
     } else {
         if (rectContainsTransformedRect(dstRect, clipBounds)) {
             c->drawImage(image.get(), dstRect, srcRect, op, blendMode);
         } else if (isFullCanvasCompositeMode(op)) {
             fullCanvasCompositedDrawImage(image.get(), dstRect, srcRect, op);
         } else if (op == CompositeCopy) {
@@ skipping 925 matching lines @@
 
 unsigned CanvasRenderingContext2D::hitRegionsCount() const
 {
     if (m_hitRegionManager)
         return m_hitRegionManager->getHitRegionsCount();
 
     return 0;
 }
 
 } // namespace WebCore