rpms/firefox/F-7 firefox-2.0.0.10-canvas-load.patch, NONE, 1.1 firefox.spec, 1.191, 1.192

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/firefox/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5506

Modified Files:
	firefox.spec 
Added Files:
	firefox-2.0.0.10-canvas-load.patch 
Log Message:
* Wed Nov 28 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.10-2
- Make Canvas.drawImage work again


firefox-2.0.0.10-canvas-load.patch:

--- NEW FILE firefox-2.0.0.10-canvas-load.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=405584
https://bugzilla.mozilla.org/show_bug.cgi?id=391028

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;
 


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-7/firefox.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- firefox.spec	27 Nov 2007 01:47:55 -0000	1.191
+++ firefox.spec	28 Nov 2007 15:08:54 -0000	1.192
@@ -12,7 +12,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        2.0.0.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -81,6 +81,9 @@
 
 %endif
 
+Patch200:       firefox-2.0.0.10-canvas-load.patch
+
+
 # ---------------------------------------------------
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -171,6 +174,8 @@
 %patch102 -p0 -b .theme-change
 %patch104 -p1 -b .ppc64
 
+%patch200 -p0 -b .canvas-load
+
 # For branding specific patches.
 
 %if %{official_branding}
@@ -427,6 +432,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Nov 28 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.10-2
+- Make Canvas.drawImage work again
+
 * Mon Nov 26 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.10-1
 - Update to 2.0.0.10