#651: speculative followup patch

classilla · Sep 25, 2022 · 7a30734 · roytam1 · Sep 26, 2022 · classilla
1 parent bc6daa0
commit 7a30734
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -5500,8 +5500,8 @@ CanvasRenderingContext2D::PutImageData_explicit(int32_t x, int32_t y, uint32_t w
     return NS_ERROR_FAILURE;
   }
 
-  uint32_t copyX = dirtyRect.x;
-  uint32_t copyY = dirtyRect.y;
+  uint32_t copyX = dirtyRect.x - x;
+  uint32_t copyY = dirtyRect.y - y;
   //uint8_t *src = aArray->Data();
   uint8_t *dst = imgsurf->Data();
   uint8_t* srcLine = aArray->Data() + copyY * (w * 4) + copyX * 4;

diff --git a/modules/libjar/nsJARChannel.cpp b/modules/libjar/nsJARChannel.cpp
@@ -714,7 +714,7 @@ nsJARChannel::GetSecurityInfo(nsISupports **aSecurityInfo)
     return NS_OK;
 }
 
-NS_IMETHODIMP
+nsresult
 nsJARChannel::SetContentTypeGuess() {
     //
     // generate content type and set it
@@ -752,7 +752,7 @@ nsJARChannel::GetContentType(nsACString &aResult)
 {
     // If the Jar file has not been open yet,
     // We return application/x-unknown-content-type
-    if (!mOpened || mContentType.IsEmpty()) {
+    if (!mOpened && mContentType.IsEmpty()) {
       aResult.Assign(UNKNOWN_CONTENT_TYPE);
       return NS_OK;
     }