From 438f72539d1ede401be31bd2b37976f4058b3074 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Thu, 29 Nov 2007 01:37:39 +0000 Subject: Fix a regression on firefox 2.0.0.10, as described in Mozilla bug 405584, affecting canvas rendering. Obtained from: https://bugzilla.mozilla.org/attachment.cgi?id=284556 Approved by: portmgr (marcus) --- www/firefox/Makefile | 1 + ...nt__canvas__src__nsCanvasRenderingContext2D.cpp | 26 ++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 www/firefox/files/patch-content__canvas__src__nsCanvasRenderingContext2D.cpp (limited to 'www/firefox') diff --git a/www/firefox/Makefile b/www/firefox/Makefile index aac7df1ee3fc..bfa0a1396acb 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -8,6 +8,7 @@ PORTNAME= firefox DISTVERSION= 2.0.0.10 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} diff --git a/www/firefox/files/patch-content__canvas__src__nsCanvasRenderingContext2D.cpp b/www/firefox/files/patch-content__canvas__src__nsCanvasRenderingContext2D.cpp new file mode 100644 index 000000000000..cf50f57e3288 --- /dev/null +++ b/www/firefox/files/patch-content__canvas__src__nsCanvasRenderingContext2D.cpp @@ -0,0 +1,26 @@ +Index: content/canvas/src/nsCanvasRenderingContext2D.cpp +=================================================================== +RCS file: /cvsroot/mozilla/content/canvas/src/nsCanvasRenderingContext2D.cpp,v +retrieving revision 1.102 +diff -u -8 -p -r1.102 nsCanvasRenderingContext2D.cpp +--- content/canvas/src/nsCanvasRenderingContext2D.cpp 10 Oct 2007 20:31:45 -0000 1.102 ++++ content/canvas/src/nsCanvasRenderingContext2D.cpp 11 Oct 2007 23:31:32 -0000 +@@ -2140,17 +2140,17 @@ nsCanvasRenderingContext2D::CairoSurface + getter_AddRefs(imgRequest)); + NS_ENSURE_SUCCESS(rv, rv); + if (!imgRequest) + // XXX ERRMSG we need to report an error to developers here! (bug 329026) + return NS_ERROR_NOT_AVAILABLE; + + PRUint32 status; + imgRequest->GetImageStatus(&status); +- if (status != imgIRequest::STATUS_LOAD_COMPLETE) ++ if ((status & imgIRequest::STATUS_LOAD_COMPLETE) == 0) + return NS_ERROR_NOT_AVAILABLE; + + nsCOMPtr uri; + rv = imageLoader->GetCurrentURI(uriOut); + NS_ENSURE_SUCCESS(rv, rv); + + *forceWriteOnlyOut = PR_FALSE; + -- cgit v1.2.3