From 13e0e6a597a7e394f81ed18fa0338c981e53ee6f Mon Sep 17 00:00:00 2001
From: Christopher Aillon <caillon@fedoraproject.org>
Date: Nov 28 2007 15:08:54 +0000
Subject: - Make Canvas.drawImage work again


---

diff --git a/firefox-2.0.0.10-canvas-load.patch b/firefox-2.0.0.10-canvas-load.patch
new file mode 100644
index 0000000..c09586b
--- /dev/null
+++ b/firefox-2.0.0.10-canvas-load.patch
@@ -0,0 +1,29 @@
+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;
+ 
diff --git a/firefox.spec b/firefox.spec
index 33779fe..a3ddc6c 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -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 @@ Patch104:       firefox-1.5-ppc64.patch
 
 %endif
 
+Patch200:       firefox-2.0.0.10-canvas-load.patch
+
+
 # ---------------------------------------------------
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -171,6 +174,8 @@ removed in favor of xulrunner-devel.
 %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 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Nov 28 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.10-2
+- Make Canvas.drawImage work again
+
 * Mon Nov 26 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.10-1
 - Update to 2.0.0.10