зеркало из https://github.com/mozilla/pjs.git
Extend invalidated region by one source row in each direction so that we fully cover the rows in a scaled image which may be drawn using a given source row. This fixes the "white lines" problem with scaled images (bug 222901). r=pavlov, sr=tor.
This commit is contained in:
bryner%brianryner.com
Родитель
47af29ff4b
Коммит
694e5e4fef
|
|
@ -411,14 +411,34 @@ nsImageFrame::IsPendingLoad(imgIContainer* aContainer) const
|
|||
}
|
||||
|
||||
nsRect
|
||||
nsImageFrame::ConvertPxRectToTwips(const nsRect& aRect) const
|
||||
nsImageFrame::SourceRectToDest(const nsRect& aRect)
|
||||
{
|
||||
float p2t;
|
||||
p2t = GetPresContext()->PixelsToTwips();
|
||||
return nsRect(NSIntPixelsToTwips(aRect.x, p2t), // x
|
||||
NSIntPixelsToTwips(aRect.y, p2t), // y
|
||||
NSIntPixelsToTwips(aRect.width, p2t), // width
|
||||
NSIntPixelsToTwips(aRect.height, p2t)); // height
|
||||
float p2t = GetPresContext()->PixelsToTwips();
|
||||
|
||||
// When scaling the image, row N of the source image may (depending on
|
||||
// the scaling function) be used to draw any row in the destination image
|
||||
// between floor(F * (N-1)) and ceil(F * (N+1)), where F is the
|
||||
// floating-point scaling factor. The same holds true for columns.
|
||||
// So, we start by computing that bound without the floor and ceiling.
|
||||
|
||||
nsRect r(NSIntPixelsToTwips(aRect.x - 1, p2t),
|
||||
NSIntPixelsToTwips(aRect.y - 1, p2t),
|
||||
NSIntPixelsToTwips(aRect.width + 2, p2t),
|
||||
NSIntPixelsToTwips(aRect.height + 2, p2t));
|
||||
|
||||
mTransform.TransformCoord(&r.x, &r.y, &r.width, &r.height);
|
||||
|
||||
// Now, round the edges out to the pixel boundary.
|
||||
int scale = (int) p2t;
|
||||
nscoord right = r.x + r.width;
|
||||
nscoord bottom = r.y + r.height;
|
||||
|
||||
r.x -= (scale + (r.x % scale)) % scale;
|
||||
r.y -= (scale + (r.y % scale)) % scale;
|
||||
r.width = right + ((scale - (right % scale)) % scale) - r.x;
|
||||
r.height = bottom + ((scale - (bottom % scale)) % scale) - r.y;
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
nsresult
|
||||
|
|
@ -597,9 +617,13 @@ nsImageFrame::OnDataAvailable(imgIRequest *aRequest,
|
|||
}
|
||||
}
|
||||
|
||||
nsRect r = ConvertPxRectToTwips(*aRect);
|
||||
mTransform.TransformCoord(&r.x, &r.y, &r.width, &r.height);
|
||||
// Invalidate updated image
|
||||
nsRect r = SourceRectToDest(*aRect);
|
||||
#ifdef DEBUG_decode
|
||||
printf("Source rect (%d,%d,%d,%d) -> invalidate dest rect (%d,%d,%d,%d)\n",
|
||||
aRect->x, aRect->y, aRect->width, aRect->height,
|
||||
r.x, r.y, r.width, r.height);
|
||||
#endif
|
||||
|
||||
Invalidate(r, PR_FALSE);
|
||||
|
||||
return NS_OK;
|
||||
|
|
@ -684,8 +708,7 @@ nsImageFrame::FrameChanged(imgIContainer *aContainer,
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
nsRect r = ConvertPxRectToTwips(*aDirtyRect);
|
||||
mTransform.TransformCoord(&r.x, &r.y, &r.width, &r.height);
|
||||
nsRect r = SourceRectToDest(*aDirtyRect);
|
||||
|
||||
// Update border+content to account for image change
|
||||
Invalidate(r, PR_FALSE);
|
||||
|
|
@ -1375,6 +1398,12 @@ nsImageFrame::Paint(nsPresContext* aPresContext,
|
|||
// Transform that to image coords
|
||||
trans.TransformCoord(&r.x, &r.y, &r.width, &r.height);
|
||||
|
||||
#ifdef DEBUG_decode
|
||||
printf("IF draw src (%d,%d,%d,%d) -> dst (%d,%d,%d,%d)\n",
|
||||
r.x, r.y, r.width, r.height, paintArea.x, paintArea.y,
|
||||
paintArea.width, paintArea.height);
|
||||
#endif
|
||||
|
||||
aRenderingContext.DrawImage(imgCon, r, paintArea);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -230,10 +230,10 @@ private:
|
|||
PRBool IsPendingLoad(imgIContainer* aContainer) const;
|
||||
|
||||
/**
|
||||
* Helper to convert a rect in pixels to one in twips using the
|
||||
* prescontext's p2t factor
|
||||
* Function to convert a dirty rect in the source image to a dirty
|
||||
* rect for the image frame.
|
||||
*/
|
||||
nsRect ConvertPxRectToTwips(const nsRect & aRect) const;
|
||||
nsRect SourceRectToDest(const nsRect & aRect);
|
||||
|
||||
/**
|
||||
* Function to call when a load fails; this handles things like alt
|
||||
|
|
|
|||
|
|
@ -411,14 +411,34 @@ nsImageFrame::IsPendingLoad(imgIContainer* aContainer) const
|
|||
}
|
||||
|
||||
nsRect
|
||||
nsImageFrame::ConvertPxRectToTwips(const nsRect& aRect) const
|
||||
nsImageFrame::SourceRectToDest(const nsRect& aRect)
|
||||
{
|
||||
float p2t;
|
||||
p2t = GetPresContext()->PixelsToTwips();
|
||||
return nsRect(NSIntPixelsToTwips(aRect.x, p2t), // x
|
||||
NSIntPixelsToTwips(aRect.y, p2t), // y
|
||||
NSIntPixelsToTwips(aRect.width, p2t), // width
|
||||
NSIntPixelsToTwips(aRect.height, p2t)); // height
|
||||
float p2t = GetPresContext()->PixelsToTwips();
|
||||
|
||||
// When scaling the image, row N of the source image may (depending on
|
||||
// the scaling function) be used to draw any row in the destination image
|
||||
// between floor(F * (N-1)) and ceil(F * (N+1)), where F is the
|
||||
// floating-point scaling factor. The same holds true for columns.
|
||||
// So, we start by computing that bound without the floor and ceiling.
|
||||
|
||||
nsRect r(NSIntPixelsToTwips(aRect.x - 1, p2t),
|
||||
NSIntPixelsToTwips(aRect.y - 1, p2t),
|
||||
NSIntPixelsToTwips(aRect.width + 2, p2t),
|
||||
NSIntPixelsToTwips(aRect.height + 2, p2t));
|
||||
|
||||
mTransform.TransformCoord(&r.x, &r.y, &r.width, &r.height);
|
||||
|
||||
// Now, round the edges out to the pixel boundary.
|
||||
int scale = (int) p2t;
|
||||
nscoord right = r.x + r.width;
|
||||
nscoord bottom = r.y + r.height;
|
||||
|
||||
r.x -= (scale + (r.x % scale)) % scale;
|
||||
r.y -= (scale + (r.y % scale)) % scale;
|
||||
r.width = right + ((scale - (right % scale)) % scale) - r.x;
|
||||
r.height = bottom + ((scale - (bottom % scale)) % scale) - r.y;
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
nsresult
|
||||
|
|
@ -597,9 +617,13 @@ nsImageFrame::OnDataAvailable(imgIRequest *aRequest,
|
|||
}
|
||||
}
|
||||
|
||||
nsRect r = ConvertPxRectToTwips(*aRect);
|
||||
mTransform.TransformCoord(&r.x, &r.y, &r.width, &r.height);
|
||||
// Invalidate updated image
|
||||
nsRect r = SourceRectToDest(*aRect);
|
||||
#ifdef DEBUG_decode
|
||||
printf("Source rect (%d,%d,%d,%d) -> invalidate dest rect (%d,%d,%d,%d)\n",
|
||||
aRect->x, aRect->y, aRect->width, aRect->height,
|
||||
r.x, r.y, r.width, r.height);
|
||||
#endif
|
||||
|
||||
Invalidate(r, PR_FALSE);
|
||||
|
||||
return NS_OK;
|
||||
|
|
@ -684,8 +708,7 @@ nsImageFrame::FrameChanged(imgIContainer *aContainer,
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
nsRect r = ConvertPxRectToTwips(*aDirtyRect);
|
||||
mTransform.TransformCoord(&r.x, &r.y, &r.width, &r.height);
|
||||
nsRect r = SourceRectToDest(*aDirtyRect);
|
||||
|
||||
// Update border+content to account for image change
|
||||
Invalidate(r, PR_FALSE);
|
||||
|
|
@ -1375,6 +1398,12 @@ nsImageFrame::Paint(nsPresContext* aPresContext,
|
|||
// Transform that to image coords
|
||||
trans.TransformCoord(&r.x, &r.y, &r.width, &r.height);
|
||||
|
||||
#ifdef DEBUG_decode
|
||||
printf("IF draw src (%d,%d,%d,%d) -> dst (%d,%d,%d,%d)\n",
|
||||
r.x, r.y, r.width, r.height, paintArea.x, paintArea.y,
|
||||
paintArea.width, paintArea.height);
|
||||
#endif
|
||||
|
||||
aRenderingContext.DrawImage(imgCon, r, paintArea);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,312 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 1998
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#ifndef nsImageFrame_h___
|
||||
#define nsImageFrame_h___
|
||||
|
||||
#include "nsSplittableFrame.h"
|
||||
#include "nsString.h"
|
||||
#include "nsAString.h"
|
||||
#include "nsPresContext.h"
|
||||
#include "nsIImageFrame.h"
|
||||
#include "nsIIOService.h"
|
||||
#include "nsIObserver.h"
|
||||
|
||||
#include "nsTransform2D.h"
|
||||
#include "imgIRequest.h"
|
||||
#include "imgIDecoderObserver.h"
|
||||
#include "imgIContainerObserver.h"
|
||||
|
||||
class nsIFrame;
|
||||
class nsImageMap;
|
||||
class nsIURI;
|
||||
class nsILoadGroup;
|
||||
struct nsHTMLReflowState;
|
||||
struct nsHTMLReflowMetrics;
|
||||
struct nsSize;
|
||||
|
||||
class nsImageFrame;
|
||||
|
||||
class nsImageListener : public imgIDecoderObserver
|
||||
{
|
||||
public:
|
||||
nsImageListener(nsImageFrame *aFrame);
|
||||
virtual ~nsImageListener();
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_IMGIDECODEROBSERVER
|
||||
NS_DECL_IMGICONTAINEROBSERVER
|
||||
|
||||
void SetFrame(nsImageFrame *frame) { mFrame = frame; }
|
||||
|
||||
private:
|
||||
nsImageFrame *mFrame;
|
||||
};
|
||||
|
||||
#define IMAGE_SIZECONSTRAINED 0x00100000
|
||||
#define IMAGE_GOTINITIALREFLOW 0x00200000
|
||||
|
||||
#define ImageFrameSuper nsSplittableFrame
|
||||
|
||||
class nsImageFrame : public ImageFrameSuper, public nsIImageFrame {
|
||||
public:
|
||||
nsImageFrame();
|
||||
|
||||
// nsISupports
|
||||
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
|
||||
|
||||
NS_IMETHOD Destroy(nsPresContext* aPresContext);
|
||||
NS_IMETHOD Init(nsPresContext* aPresContext,
|
||||
nsIContent* aContent,
|
||||
nsIFrame* aParent,
|
||||
nsStyleContext* aContext,
|
||||
nsIFrame* aPrevInFlow);
|
||||
NS_IMETHOD Paint(nsPresContext* aPresContext,
|
||||
nsIRenderingContext& aRenderingContext,
|
||||
const nsRect& aDirtyRect,
|
||||
nsFramePaintLayer aWhichLayer,
|
||||
PRUint32 aFlags = 0);
|
||||
NS_IMETHOD Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
|
||||
NS_IMETHOD CanContinueTextRun(PRBool& aContinueTextRun) const;
|
||||
|
||||
|
||||
NS_IMETHOD GetContentForEvent(nsPresContext* aPresContext,
|
||||
nsEvent* aEvent,
|
||||
nsIContent** aContent);
|
||||
NS_IMETHOD HandleEvent(nsPresContext* aPresContext,
|
||||
nsGUIEvent* aEvent,
|
||||
nsEventStatus* aEventStatus);
|
||||
NS_IMETHOD GetCursor(nsPresContext* aPresContext,
|
||||
nsPoint& aPoint,
|
||||
PRInt32& aCursor);
|
||||
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
|
||||
nsIContent* aChild,
|
||||
PRInt32 aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
PRInt32 aModType);
|
||||
|
||||
#ifdef ACCESSIBILITY
|
||||
NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
|
||||
#endif
|
||||
|
||||
virtual nsIAtom* GetType() const;
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD List(nsPresContext* aPresContext, FILE* out, PRInt32 aIndent) const;
|
||||
#endif
|
||||
|
||||
NS_IMETHOD GetImageMap(nsPresContext *aPresContext, nsIImageMap **aImageMap);
|
||||
|
||||
NS_IMETHOD GetIntrinsicImageSize(nsSize& aSize);
|
||||
|
||||
static void ReleaseGlobals() {
|
||||
if (gIconLoad) {
|
||||
gIconLoad->Shutdown();
|
||||
NS_RELEASE(gIconLoad);
|
||||
}
|
||||
NS_IF_RELEASE(sIOService);
|
||||
}
|
||||
|
||||
protected:
|
||||
// nsISupports
|
||||
NS_IMETHOD_(nsrefcnt) AddRef(void);
|
||||
NS_IMETHOD_(nsrefcnt) Release(void);
|
||||
|
||||
virtual ~nsImageFrame();
|
||||
|
||||
virtual void GetDesiredSize(nsPresContext* aPresContext,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsHTMLReflowMetrics& aDesiredSize);
|
||||
|
||||
nsImageMap* GetImageMap(nsPresContext* aPresContext);
|
||||
|
||||
void TriggerLink(nsPresContext* aPresContext,
|
||||
nsIURI* aURI,
|
||||
const nsString& aTargetSpec,
|
||||
PRBool aClick);
|
||||
|
||||
PRBool IsServerImageMap();
|
||||
|
||||
void TranslateEventCoords(nsPresContext* aPresContext,
|
||||
const nsPoint& aPoint,
|
||||
nsPoint& aResult);
|
||||
|
||||
PRBool GetAnchorHREFAndTarget(nsIURI** aHref, nsString& aTarget);
|
||||
|
||||
void MeasureString(const PRUnichar* aString,
|
||||
PRInt32 aLength,
|
||||
nscoord aMaxWidth,
|
||||
PRUint32& aMaxFit,
|
||||
nsIRenderingContext& aContext);
|
||||
|
||||
void DisplayAltText(nsPresContext* aPresContext,
|
||||
nsIRenderingContext& aRenderingContext,
|
||||
const nsString& aAltText,
|
||||
const nsRect& aRect);
|
||||
|
||||
void DisplayAltFeedback(nsPresContext* aPresContext,
|
||||
nsIRenderingContext& aRenderingContext,
|
||||
imgIRequest* aRequest);
|
||||
|
||||
void GetInnerArea(nsPresContext* aPresContext,
|
||||
nsRect& aInnerArea) const;
|
||||
|
||||
protected:
|
||||
friend class nsImageListener;
|
||||
nsresult OnStartContainer(imgIRequest *aRequest, imgIContainer *aImage);
|
||||
nsresult OnDataAvailable(imgIRequest *aRequest,
|
||||
gfxIImageFrame *aFrame,
|
||||
const nsRect * rect);
|
||||
nsresult OnStopDecode(imgIRequest *aRequest,
|
||||
nsresult aStatus,
|
||||
const PRUnichar *aStatusArg);
|
||||
nsresult FrameChanged(imgIContainer *aContainer,
|
||||
gfxIImageFrame *aNewframe,
|
||||
nsRect *aDirtyRect);
|
||||
|
||||
private:
|
||||
// random helpers
|
||||
inline void SpecToURI(const nsAString& aSpec, nsIIOService *aIOService,
|
||||
nsIURI **aURI);
|
||||
|
||||
inline void GetLoadGroup(nsPresContext *aPresContext,
|
||||
nsILoadGroup **aLoadGroup);
|
||||
nscoord GetContinuationOffset(nscoord* aWidth = 0) const;
|
||||
void GetDocumentCharacterSet(nsACString& aCharset) const;
|
||||
|
||||
/**
|
||||
* This function will recalculate mTransform. If a non-null image
|
||||
* is passed in, mIntrinsicSize will be recalculated from the image
|
||||
* size. Otherwise, mIntrinsicSize will not be touched.
|
||||
*
|
||||
* @return PR_TRUE if aImage is non-null and its size did _not_
|
||||
* match our previous intrinsic size
|
||||
* @return PR_FALSE otherwise
|
||||
*/
|
||||
PRBool RecalculateTransform(imgIContainer* aImage);
|
||||
|
||||
/**
|
||||
* Helper functions to check whether the request or image container
|
||||
* corresponds to a load we don't care about. Most of the decoder
|
||||
* observer methods will bail early if these return true.
|
||||
*/
|
||||
PRBool IsPendingLoad(imgIRequest* aRequest) const;
|
||||
PRBool IsPendingLoad(imgIContainer* aContainer) const;
|
||||
|
||||
/**
|
||||
* Helper to convert a rect in pixels to one in twips using the
|
||||
* prescontext's p2t factor
|
||||
*/
|
||||
nsRect ConvertPxRectToTwips(const nsRect & aRect) const;
|
||||
|
||||
/**
|
||||
* Function to call when a load fails; this handles things like alt
|
||||
* text, broken image icons, etc. Returns NS_ERROR_FRAME_REPLACED
|
||||
* if it called CantRenderReplacedElement, NS_OK otherwise.
|
||||
*/
|
||||
nsresult HandleLoadError(nsresult aStatus, nsIPresShell* aPresShell);
|
||||
|
||||
nsImageMap* mImageMap;
|
||||
|
||||
nsCOMPtr<imgIDecoderObserver> mListener;
|
||||
|
||||
nsSize mComputedSize;
|
||||
nsSize mIntrinsicSize;
|
||||
nsTransform2D mTransform;
|
||||
|
||||
nsMargin mBorderPadding;
|
||||
|
||||
static nsIIOService* sIOService;
|
||||
|
||||
/* loading / broken image icon support */
|
||||
|
||||
// XXXbz this should be handled by the prescontext, I think; that
|
||||
// way we would have a single iconload per mozilla session instead
|
||||
// of one per document...
|
||||
|
||||
// LoadIcons: initiate the loading of the static icons used to show
|
||||
// loading / broken images
|
||||
nsresult LoadIcons(nsPresContext *aPresContext);
|
||||
nsresult LoadIcon(const nsAString& aSpec, nsPresContext *aPresContext,
|
||||
imgIRequest **aRequest);
|
||||
|
||||
// HandleIconLoads: See if the request is for an Icon load. If it
|
||||
// is, handle it and return TRUE otherwise, return FALSE (aCompleted
|
||||
// is an input arg telling the routine if the request has completed)
|
||||
PRBool HandleIconLoads(imgIRequest* aRequest, PRBool aCompleted);
|
||||
void InvalidateIcon();
|
||||
|
||||
class IconLoad : public nsIObserver {
|
||||
// private class that wraps the data and logic needed for
|
||||
// broken image and loading image icons
|
||||
public:
|
||||
IconLoad(imgIDecoderObserver* aObserver);
|
||||
|
||||
void Shutdown()
|
||||
{
|
||||
// in case the pref service releases us later
|
||||
if (mLoadingImage) {
|
||||
mLoadingImage->Cancel(NS_ERROR_FAILURE);
|
||||
mLoadingImage = nsnull;
|
||||
}
|
||||
if (mBrokenImage) {
|
||||
mBrokenImage->Cancel(NS_ERROR_FAILURE);
|
||||
mBrokenImage = nsnull;
|
||||
}
|
||||
}
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIOBSERVER
|
||||
|
||||
private:
|
||||
void GetPrefs();
|
||||
|
||||
public:
|
||||
nsCOMPtr<imgIRequest> mLoadingImage;
|
||||
nsCOMPtr<imgIRequest> mBrokenImage;
|
||||
nsCOMPtr<imgIDecoderObserver> mLoadObserver; // keeps the observer alive
|
||||
PRUint8 mIconsLoaded;
|
||||
PRPackedBool mPrefForceInlineAltText;
|
||||
PRPackedBool mPrefAllImagesBlocked;
|
||||
PRPackedBool mPrefShowPlaceholders;
|
||||
};
|
||||
static IconLoad* gIconLoad; // singleton pattern: one LoadIcons instance is used
|
||||
};
|
||||
|
||||
#endif /* nsImageFrame_h___ */
|
||||
Загрузка…
Ссылка в новой задаче