#651: speculative followup patch
This commit is contained in:
parent
bc6daa0aea
commit
7a3073423e
|
@ -5500,8 +5500,8 @@ CanvasRenderingContext2D::PutImageData_explicit(int32_t x, int32_t y, uint32_t w
|
||||||
return NS_ERROR_FAILURE;
|
return NS_ERROR_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t copyX = dirtyRect.x;
|
uint32_t copyX = dirtyRect.x - x;
|
||||||
uint32_t copyY = dirtyRect.y;
|
uint32_t copyY = dirtyRect.y - y;
|
||||||
//uint8_t *src = aArray->Data();
|
//uint8_t *src = aArray->Data();
|
||||||
uint8_t *dst = imgsurf->Data();
|
uint8_t *dst = imgsurf->Data();
|
||||||
uint8_t* srcLine = aArray->Data() + copyY * (w * 4) + copyX * 4;
|
uint8_t* srcLine = aArray->Data() + copyY * (w * 4) + copyX * 4;
|
||||||
|
|
|
@ -714,7 +714,7 @@ nsJARChannel::GetSecurityInfo(nsISupports **aSecurityInfo)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
nsresult
|
||||||
nsJARChannel::SetContentTypeGuess() {
|
nsJARChannel::SetContentTypeGuess() {
|
||||||
//
|
//
|
||||||
// generate content type and set it
|
// generate content type and set it
|
||||||
|
@ -752,7 +752,7 @@ nsJARChannel::GetContentType(nsACString &aResult)
|
||||||
{
|
{
|
||||||
// If the Jar file has not been open yet,
|
// If the Jar file has not been open yet,
|
||||||
// We return application/x-unknown-content-type
|
// We return application/x-unknown-content-type
|
||||||
if (!mOpened || mContentType.IsEmpty()) {
|
if (!mOpened && mContentType.IsEmpty()) {
|
||||||
aResult.Assign(UNKNOWN_CONTENT_TYPE);
|
aResult.Assign(UNKNOWN_CONTENT_TYPE);
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue