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)
This commit is contained in:
parent
d2f763a900
commit
438f72539d
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=202859
6 changed files with 81 additions and 0 deletions
|
@ -8,6 +8,7 @@
|
|||
|
||||
PORTNAME= firefox
|
||||
DISTVERSION= 2.0.0.10
|
||||
PORTREVISION= 1
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= www ipv6
|
||||
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
|
||||
|
|
|
@ -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<nsIURI> uri;
|
||||
rv = imageLoader->GetCurrentURI(uriOut);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
*forceWriteOnlyOut = PR_FALSE;
|
||||
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
PORTNAME= firefox
|
||||
DISTVERSION= 2.0.0.10
|
||||
PORTREVISION= 1
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= www ipv6
|
||||
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
|
||||
|
|
|
@ -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<nsIURI> uri;
|
||||
rv = imageLoader->GetCurrentURI(uriOut);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
*forceWriteOnlyOut = PR_FALSE;
|
||||
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
PORTNAME= firefox
|
||||
DISTVERSION= 2.0.0.10
|
||||
PORTREVISION= 1
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= www ipv6
|
||||
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
|
||||
|
|
|
@ -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<nsIURI> uri;
|
||||
rv = imageLoader->GetCurrentURI(uriOut);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
*forceWriteOnlyOut = PR_FALSE;
|
||||
|
Loading…
Reference in a new issue