Fix a bug where animated GIF's would blink.

Submitted by:	Michal Varga varga.michal@gmail.com
Obtained from:	http://gitorious.org/webkitgtk
This commit is contained in:
Koop Mast 2011-03-12 13:01:09 +00:00
parent 993a514b47
commit 36b9a0c7db
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=270737
2 changed files with 37 additions and 0 deletions

View file

@ -8,6 +8,7 @@
PORTNAME= webkit
PORTVERSION= 1.2.7
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/
PKGNAMESUFFIX= -gtk2

View file

@ -0,0 +1,36 @@
From bd6bf8e203cabe7073d4880c64a1ab86ebc1264b Mon Sep 17 00:00:00 2001
From: Gustavo Noronha Silva <gns@gnome.org>
Date: Tue, 8 Mar 2011 09:42:13 -0300
Subject: [PATCH] Fix bad merge that left trailing semicolons on a couple if statements
This was causing gifs to blink instead of animating. For more details
look here: https://bugs.webkit.org/show_bug.cgi?id=55830
---
.../image-decoders/gif/GIFImageDecoder.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp b/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
index dc288fd..3bb2340 100644
--- WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
+++ WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
@@ -343,7 +343,7 @@ bool GIFImageDecoder::initFrameBuffer(unsigned frameIndex)
if ((prevMethod == RGBA32Buffer::DisposeNotSpecified) || (prevMethod == RGBA32Buffer::DisposeKeep)) {
// Preserve the last frame as the starting state for this frame.
- if (!buffer->copyBitmapData(*prevBuffer));
+ if (!buffer->copyBitmapData(*prevBuffer))
return setFailed();
} else {
// We want to clear the previous frame to transparent, without
@@ -357,7 +357,7 @@ bool GIFImageDecoder::initFrameBuffer(unsigned frameIndex)
return setFailed();
} else {
// Copy the whole previous buffer, then clear just its frame.
- if (!buffer->copyBitmapData(*prevBuffer));
+ if (!buffer->copyBitmapData(*prevBuffer))
return setFailed();
for (int y = prevRect.y(); y < prevRect.bottom(); ++y) {
for (int x = prevRect.x(); x < prevRect.right(); ++x)
--
1.6.1