Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 454224, Drag feedback should handle canvases not in a document, r+sr=roc

Browse Source
This commit is contained in:
Neil Deakin 2008-09-10 12:57:58 -04:00
parent 45ce2a8581
commit 9d3a3227cd
2 changed files with 57 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
widget/src/xpwidgets/nsBaseDragService.cpp
View File

@ -479,11 +479,17 @@ nsBaseDragService::DrawDrag(nsIDOMNode* aDOMNode,
// using the source rather than the displayed image. But if mImage isn't
// an image, fall through to RenderNode below.
if (mImage) {
nsCOMPtr<nsICanvasElement> canvas = do_QueryInterface(dragNode);
if (canvas) {
return DrawDragForImage(*aPresContext, nsnull, canvas, aScreenX,
aScreenY, aScreenDragRect, aSurface);
}
nsCOMPtr<nsIImageLoadingContent> imageLoader = do_QueryInterface(dragNode);
// for image nodes, create the drag image from the actual image data
if (imageLoader) {
return DrawDragForImage(*aPresContext, imageLoader, aScreenX, aScreenY,
aScreenDragRect, aSurface);
return DrawDragForImage(*aPresContext, imageLoader, nsnull, aScreenX,
aScreenY, aScreenDragRect, aSurface);
}
}
@ -512,35 +518,46 @@ nsBaseDragService::DrawDrag(nsIDOMNode* aDOMNode,
nsresult
nsBaseDragService::DrawDragForImage(nsPresContext* aPresContext,
nsIImageLoadingContent* aImageLoader,
nsICanvasElement* aCanvas,
PRInt32 aScreenX, PRInt32 aScreenY,
nsRect* aScreenDragRect,
gfxASurface** aSurface)
{
nsCOMPtr<imgIRequest> imgRequest;
nsresult rv = aImageLoader->GetRequest(nsIImageLoadingContent::CURRENT_REQUEST,
getter_AddRefs(imgRequest));
NS_ENSURE_SUCCESS(rv, rv);
if (!imgRequest)
return NS_ERROR_NOT_AVAILABLE;
nsCOMPtr<nsIImage> img;
if (aImageLoader) {
nsCOMPtr<imgIRequest> imgRequest;
nsresult rv = aImageLoader->GetRequest(nsIImageLoadingContent::CURRENT_REQUEST,
getter_AddRefs(imgRequest));
NS_ENSURE_SUCCESS(rv, rv);
if (!imgRequest)
return NS_ERROR_NOT_AVAILABLE;
nsCOMPtr<imgIContainer> imgContainer;
rv = imgRequest->GetImage(getter_AddRefs(imgContainer));
NS_ENSURE_SUCCESS(rv, rv);
if (!imgContainer)
return NS_ERROR_NOT_AVAILABLE;
nsCOMPtr<imgIContainer> imgContainer;
rv = imgRequest->GetImage(getter_AddRefs(imgContainer));
NS_ENSURE_SUCCESS(rv, rv);
if (!imgContainer)
return NS_ERROR_NOT_AVAILABLE;
nsCOMPtr<gfxIImageFrame> iframe;
imgContainer->GetCurrentFrame(getter_AddRefs(iframe));
if (!iframe)
return NS_ERROR_FAILURE;
nsCOMPtr<gfxIImageFrame> iframe;
imgContainer->GetCurrentFrame(getter_AddRefs(iframe));
if (!iframe)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIImage> img(do_GetInterface(iframe));
if (!img)
return NS_ERROR_FAILURE;
img = do_GetInterface(iframe);
if (!img)
return NS_ERROR_FAILURE;
// use the size of the image as the size of the drag image
imgContainer->GetWidth(&aScreenDragRect->width);
imgContainer->GetHeight(&aScreenDragRect->height);
// use the size of the image as the size of the drag image
imgContainer->GetWidth(&aScreenDragRect->width);
imgContainer->GetHeight(&aScreenDragRect->height);
}
else {
NS_ASSERTION(aCanvas, "both image and canvas are null");
PRUint32 width, height;
aCanvas->GetSize(&width, &height);
aScreenDragRect->width = width;
aScreenDragRect->height = height;
}
nsRect srcRect = *aScreenDragRect;
srcRect.MoveTo(0, 0);
@ -585,15 +602,20 @@ nsBaseDragService::DrawDragForImage(nsPresContext* aPresContext,
deviceContext->CreateRenderingContextInstance(*getter_AddRefs(rc));
rc->Init(deviceContext, surface);
// clear the image before drawing
gfxContext context(surface);
context.SetOperator(gfxContext::OPERATOR_CLEAR);
context.Rectangle(gfxRect(0, 0, destRect.width, destRect.height));
context.Fill();
if (aImageLoader) {
// clear the image before drawing
gfxContext context(surface);
context.SetOperator(gfxContext::OPERATOR_CLEAR);
context.Rectangle(gfxRect(0, 0, destRect.width, destRect.height));
context.Fill();
gfxRect inRect = gfxRect(srcRect.x, srcRect.y, srcRect.width, srcRect.height);
gfxRect outRect = gfxRect(destRect.x, destRect.y, destRect.width, destRect.height);
return img->Draw(*rc, inRect, inRect, outRect);
gfxRect inRect = gfxRect(srcRect.x, srcRect.y, srcRect.width, srcRect.height);
gfxRect outRect = gfxRect(destRect.x, destRect.y, destRect.width, destRect.height);
return img->Draw(*rc, inRect, inRect, outRect);
}
else {
return aCanvas->RenderContexts(rc->ThebesContext());
}
}
void

5
widget/src/xpwidgets/nsBaseDragService.h
View File

@ -56,6 +56,7 @@ class nsIDOMNode;
class nsIFrame;
class nsPresContext;
class nsIImageLoadingContent;
class nsICanvasElement;
/**
* XP DragService wrapper base class
@ -107,10 +108,12 @@ protected:
nsPresContext **aPresContext);
/**
* Draw a drag image for an image node. This is called by DrawDrag.
* Draw a drag image for an image node specified by aImageLoader or aCanvas.
* This is called by DrawDrag.
*/
nsresult DrawDragForImage(nsPresContext* aPresContext,
nsIImageLoadingContent* aImageLoader,
nsICanvasElement* aCanvas,
PRInt32 aScreenX, PRInt32 aScreenY,
nsRect* aScreenDragRect,
gfxASurface** aSurface);