mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 336653 - Remove nsISVGPattern. r+sr=roc

This commit is contained in:
tor%cs.brown.edu 2006-05-05 16:06:43 +00:00
Родитель 727d0e8949
Коммит efb5268435
12 изменённых файлов: 246 добавлений и 371 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

22
layout/svg/base/src/nsSVGGeometryFrame.cpp
Просмотреть файл

@ -41,7 +41,7 @@
#include "nsSVGUtils.h"
#include "nsSVGGeometryFrame.h"
#include "nsISVGGradient.h"
#include "nsISVGPattern.h"
#include "nsSVGPatternFrame.h"
//----------------------------------------------------------------------
// nsISupports methods
@ -69,10 +69,10 @@ nsSVGGeometryFrame::~nsSVGGeometryFrame()
NS_REMOVE_SVGVALUE_OBSERVER(mStrokeGradient);
}
if (mFillPattern) {
NS_REMOVE_SVGVALUE_OBSERVER(mFillPattern);
mFillPattern->RemoveObserver(this);
}
if (mStrokePattern) {
NS_REMOVE_SVGVALUE_OBSERVER(mStrokePattern);
mStrokePattern->RemoveObserver(this);
}
}
@ -90,11 +90,11 @@ nsSVGGeometryFrame::DidSetStyleContext()
mStrokeGradient = nsnull;
}
if (mFillPattern) {
NS_REMOVE_SVGVALUE_OBSERVER(mFillPattern);
mFillPattern->RemoveObserver(this);
mFillPattern = nsnull;
}
if (mStrokePattern) {
NS_REMOVE_SVGVALUE_OBSERVER(mStrokePattern);
mStrokePattern->RemoveObserver(this);
mStrokePattern = nsnull;
}
@ -133,10 +133,10 @@ nsSVGGeometryFrame::DidModifySVGObservable(nsISVGValue* observable,
return NS_OK;
}
nsISVGPattern *pval;
nsIFrame *pval;
CallQueryInterface(observable, &pval);
if (pval) {
if (pval && pval->GetType() == nsLayoutAtoms::svgPatternFrame) {
// Handle Patterns
if (mFillPattern == pval) {
if (aModType == nsISVGValue::mod_die) {
@ -270,7 +270,7 @@ nsSVGGeometryFrame::GetStrokeGradient(nsISVGGradient **aGrad)
}
nsresult
nsSVGGeometryFrame::GetStrokePattern(nsISVGPattern **aPat)
nsSVGGeometryFrame::GetStrokePattern(nsSVGPatternFrame **aPat)
{
nsresult rv = NS_OK;
*aPat = nsnull;
@ -283,7 +283,7 @@ nsSVGGeometryFrame::GetStrokePattern(nsISVGPattern **aPat)
rv = NS_GetSVGPattern(&mStrokePattern, aServer, mContent,
GetPresContext()->PresShell());
if (mStrokePattern)
NS_ADD_SVGVALUE_OBSERVER(mStrokePattern);
mStrokePattern->AddObserver(this);
}
*aPat = mStrokePattern;
return rv;
@ -323,7 +323,7 @@ nsSVGGeometryFrame::GetFillGradient(nsISVGGradient **aGrad)
}
nsresult
nsSVGGeometryFrame::GetFillPattern(nsISVGPattern **aPat)
nsSVGGeometryFrame::GetFillPattern(nsSVGPatternFrame **aPat)
{
nsresult rv = NS_OK;
*aPat = nsnull;
@ -336,7 +336,7 @@ nsSVGGeometryFrame::GetFillPattern(nsISVGPattern **aPat)
rv = NS_GetSVGPattern(&mFillPattern, aServer, mContent,
GetPresContext()->PresShell());
if (mFillPattern)
NS_ADD_SVGVALUE_OBSERVER(mFillPattern);
mFillPattern->AddObserver(this);
}
*aPat = mFillPattern;
return rv;

10
layout/svg/base/src/nsSVGGeometryFrame.h
Просмотреть файл

@ -43,7 +43,7 @@
#include <cairo.h>
class nsISVGGradient;
class nsISVGPattern;
class nsSVGPatternFrame;
typedef nsFrame nsSVGGeometryFrameBase;
@ -85,11 +85,11 @@ public:
PRUint16 GetStrokePaintType();
nsresult GetStrokePaintServerType(PRUint16 *aStrokePaintServerType);
nsresult GetStrokeGradient(nsISVGGradient **aGrad);
nsresult GetStrokePattern(nsISVGPattern **aPat);
nsresult GetStrokePattern(nsSVGPatternFrame **aPat);
PRUint16 GetFillPaintType();
nsresult GetFillPaintServerType(PRUint16 *aFillPaintServerType);
nsresult GetFillGradient(nsISVGGradient **aGrad);
nsresult GetFillPattern(nsISVGPattern **aPat);
nsresult GetFillPattern(nsSVGPatternFrame **aPat);
// Set up a cairo context for filling a path
void SetupCairoFill(cairo_t *aCtx);
@ -134,8 +134,8 @@ private:
nsISVGGradient* mFillGradient;
nsISVGGradient* mStrokeGradient;
nsISVGPattern* mFillPattern;
nsISVGPattern* mStrokePattern;
nsSVGPatternFrame* mFillPattern;
nsSVGPatternFrame* mStrokePattern;
};
#endif // __NS_SVGGEOMETRYFRAME_H__

55
layout/svg/base/src/nsSVGPattern.h
Просмотреть файл

@ -1,55 +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 the Mozilla SVG project.
*
* The Initial Developer of the Original Code is
* Scooter Morris.
* Portions created by the Initial Developer are Copyright (C) 2005
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Scooter Morris <scootermorris@comcast.net> (original author)
*
* Alternatively, the contents of this file may be used under the terms of
* either 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 __NS_SVGPATTERN_H__
#define __NS_SVGPATTERN_H__
#include "nscore.h"
class nsISVGPattern;
class nsIURI;
class nsIContent;
class nsIPresShell;
nsresult NS_GetSVGPattern(nsISVGPattern** result,
nsIURI* aURI,
nsIContent* aContent,
nsIPresShell* aPresShell);
#endif // __NS_SVGPATTERN_H__

281
layout/svg/base/src/nsSVGPatternFrame.cpp
Просмотреть файл

@ -36,171 +36,34 @@
*
* ***** END LICENSE BLOCK ***** */
#include "nsIDOMSVGFitToViewBox.h"
#include "nsSVGPattern.h"
#include "nsWeakReference.h"
#include "nsIDOMDocument.h"
#include "nsIDocument.h"
#include "nsIDOMSVGStopElement.h"
#include "nsGkAtoms.h"
#include "nsIDOMSVGLength.h"
#include "nsIDOMSVGAnimatedEnum.h"
#include "nsIDOMSVGAnimatedLength.h"
#include "nsIDOMSVGAnimatedNumber.h"
#include "nsIDOMSVGAnimatedRect.h"
#include "nsIDOMSVGAnimatedString.h"
#include "nsIDOMSVGAnimTransformList.h"
#include "nsIDOMSVGTransformList.h"
#include "nsSVGPreserveAspectRatio.h"
#include "nsSVGAnimatedPreserveAspectRatio.h"
#include "nsIDOMSVGNumber.h"
#include "nsIDOMSVGPatternElement.h"
#include "nsIDOMSVGURIReference.h"
#include "nsISVGValue.h"
#include "nsISVGValueUtils.h"
#include "nsStyleContext.h"
#include "nsISVGValueObserver.h"
#include "nsSVGValue.h"
#include "nsNetUtil.h"
#include "nsINameSpaceManager.h"
#include "nsISVGChildFrame.h"
#include "nsIDOMSVGRect.h"
#include "nsSVGMatrix.h"
#include "nsSVGRect.h"
#include "nsISVGPattern.h"
#include "nsIURI.h"
#include "nsIContent.h"
#include "nsContentUtils.h"
#include "nsSVGNumber.h"
#include "nsLayoutAtoms.h"
#include "nsISVGRenderer.h"
#include "nsISVGRendererCanvas.h"
#include "nsISVGRendererSurface.h"
#include "nsSVGUtils.h"
#include "nsISVGOuterSVGFrame.h"
#include "nsISVGContainerFrame.h"
#include "nsSVGDefsFrame.h"
#include "nsSVGPatternElement.h"
#include "nsSVGGeometryFrame.h"
typedef nsSVGDefsFrame nsSVGPatternFrameBase;
#include "nsSVGPatternFrame.h"
#ifdef DEBUG_scooter
static void printCTM(char *msg, nsIDOMSVGMatrix *aCTM);
static void printRect(char *msg, nsIDOMSVGRect *aRect);
#endif
class nsSVGPatternFrame : public nsSVGPatternFrameBase,
public nsSVGValue,
public nsISVGPattern,
public nsISVGValueObserver,
public nsSupportsWeakReference
{
public:
friend nsIFrame* NS_NewSVGPatternFrame(nsIPresShell* aPresShell,
nsIContent* aContent,
nsStyleContext* aContext);
friend nsresult NS_GetSVGPatternFrame(nsIFrame** result,
nsIURI* aURI,
nsIContent* aContent,
nsIPresShell* aPresShell);
nsSVGPatternFrame(nsStyleContext* aContext) : nsSVGPatternFrameBase(aContext) {}
// nsISupports interface:
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; }
NS_IMETHOD_(nsrefcnt) Release() { return NS_OK; }
// nsISVGPattern interface:
NS_DECL_NSISVGPATTERN
// nsISVGValue interface:
NS_IMETHOD SetValueString(const nsAString &aValue) { return NS_OK; }
NS_IMETHOD GetValueString(nsAString& aValue) {
return NS_ERROR_NOT_IMPLEMENTED;
}
// nsISVGValueObserver interface:
NS_IMETHOD WillModifySVGObservable(nsISVGValue* observable,
nsISVGValue::modificationType aModType);
NS_IMETHOD DidModifySVGObservable(nsISVGValue* observable,
nsISVGValue::modificationType aModType);
// nsISVGContainerFrame interface:
already_AddRefed<nsIDOMSVGMatrix> GetCanvasTM();
already_AddRefed<nsSVGCoordCtxProvider> GetCoordContextProvider();
NS_IMETHOD GetBBox(nsIDOMSVGRect **aRect);
// nsIFrame interface:
NS_IMETHOD DidSetStyleContext();
NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);
/**
* Get the "type" of the frame
*
* @see nsLayoutAtoms::svgPatternFrame
*/
virtual nsIAtom* GetType() const;
virtual PRBool IsFrameOfType(PRUint32 aFlags) const;
#ifdef DEBUG
// nsIFrameDebug interface:
NS_IMETHOD GetFrameName(nsAString& aResult) const
{
return MakeFrameName(NS_LITERAL_STRING("SVGPattern"), aResult);
}
#endif // DEBUG
protected:
virtual ~nsSVGPatternFrame();
// Internal methods for handling referenced patterns
PRBool checkURITarget(nsIAtom *);
PRBool checkURITarget();
//
nsSVGLength2 *GetX();
nsSVGLength2 *GetY();
nsSVGLength2 *GetWidth();
nsSVGLength2 *GetHeight();
NS_IMETHOD GetPreserveAspectRatio(nsIDOMSVGAnimatedPreserveAspectRatio
**aPreserveAspectRatio);
NS_IMETHOD GetPatternFirstChild(nsIFrame **kid);
NS_IMETHOD GetViewBox(nsIDOMSVGRect * *aMatrix);
nsresult GetPatternRect(nsIDOMSVGRect **patternRect, nsIDOMSVGRect *bbox,
nsSVGElement *content);
nsresult GetPatternMatrix(nsIDOMSVGMatrix **aCTM,
nsIDOMSVGRect *bbox,
nsIDOMSVGMatrix *callerCTM);
nsresult ConstructCTM(nsIDOMSVGMatrix **ctm, nsIDOMSVGRect *callerBBox);
nsresult CreateSurface(nsISVGRendererSurface **aSurface);
nsresult GetCallerGeometry(nsIDOMSVGMatrix **aCTM,
nsIDOMSVGRect **aBBox,
nsSVGElement **aContent,
nsSVGGeometryFrame *aSource);
//
private:
nsCOMPtr<nsIDOMSVGRect> mBBox;
// this is a *temporary* reference to the frame of the element currently
// referencing our pattern. This must be termporary because different
// referencing frames will all reference this one fram
nsSVGGeometryFrame *mSource;
nsCOMPtr<nsIDOMSVGMatrix> mCTM;
protected:
nsSVGPatternFrame *mNextPattern;
nsCOMPtr<nsIDOMSVGAnimatedString> mHref;
PRPackedBool mLoopFlag;
};
//----------------------------------------------------------------------
// Implementation
@ -219,7 +82,6 @@ nsSVGPatternFrame::~nsSVGPatternFrame()
NS_INTERFACE_MAP_BEGIN(nsSVGPatternFrame)
NS_INTERFACE_MAP_ENTRY(nsISVGValue)
NS_INTERFACE_MAP_ENTRY(nsISVGPattern)
NS_INTERFACE_MAP_ENTRY(nsISVGContainerFrame)
NS_INTERFACE_MAP_ENTRY(nsISVGValueObserver)
NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
@ -240,13 +102,12 @@ NS_IMETHODIMP
nsSVGPatternFrame::DidModifySVGObservable(nsISVGValue* observable,
nsISVGValue::modificationType aModType)
{
nsCOMPtr<nsISVGPattern> pattern = do_QueryInterface(observable);
nsIFrame *pattern = nsnull;
CallQueryInterface(observable, &pattern);
// Is this a pattern we are observing that is going away?
if (mNextPattern && aModType == nsISVGValue::mod_die && pattern) {
// Yes, we need to handle this differently
nsISVGPattern *patt;
CallQueryInterface(mNextPattern, &patt);
if (patt == pattern) {
if (mNextPattern == pattern) {
mNextPattern = nsnull;
}
}
@ -381,10 +242,7 @@ nsSVGPatternFrame::GetBBox(nsIDOMSVGRect **aRect) {
return NS_ERROR_FAILURE;
}
//----------------------------------------------------------------------
// nsISVGPattern implementation
//----------------------------------------------------------------------
NS_IMETHODIMP
nsresult
nsSVGPatternFrame::PaintPattern(nsISVGRendererCanvas* canvas,
nsISVGRendererSurface** surface,
nsIDOMSVGMatrix** patternMatrix,
@ -518,9 +376,11 @@ nsSVGPatternFrame::GetPatternFirstChild(nsIFrame **kid)
return rv;
}
NS_IMETHODIMP
nsSVGPatternFrame::GetPatternUnits(PRUint16 *aUnits)
PRUint16
nsSVGPatternFrame::GetPatternUnits()
{
PRUint16 rv;
// See if we need to get the value from another pattern
if (!checkURITarget(nsGkAtoms::patternUnits)) {
// No, return the values
@ -528,18 +388,20 @@ nsSVGPatternFrame::GetPatternUnits(PRUint16 *aUnits)
do_QueryInterface(mContent);
nsCOMPtr<nsIDOMSVGAnimatedEnumeration> units;
patternElement->GetPatternUnits(getter_AddRefs(units));
units->GetAnimVal(aUnits);
units->GetAnimVal(&rv);
} else {
// Yes, get it from the target
mNextPattern->GetPatternUnits(aUnits);
rv = mNextPattern->GetPatternUnits();
}
mLoopFlag = PR_FALSE;
return NS_OK;
return rv;
}
NS_IMETHODIMP
nsSVGPatternFrame::GetPatternContentUnits(PRUint16 *aUnits)
PRUint16
nsSVGPatternFrame::GetPatternContentUnits()
{
PRUint16 rv;
// See if we need to get the value from another pattern
if (!checkURITarget(nsGkAtoms::patternContentUnits)) {
// No, return the values
@ -547,19 +409,20 @@ nsSVGPatternFrame::GetPatternContentUnits(PRUint16 *aUnits)
do_QueryInterface(mContent);
nsCOMPtr<nsIDOMSVGAnimatedEnumeration> units;
patternElement->GetPatternContentUnits(getter_AddRefs(units));
units->GetAnimVal(aUnits);
units->GetAnimVal(&rv);
} else {
// Yes, get it from the target
mNextPattern->GetPatternContentUnits(aUnits);
rv = mNextPattern->GetPatternContentUnits();
}
mLoopFlag = PR_FALSE;
return NS_OK;
return rv;
}
NS_IMETHODIMP
nsresult
nsSVGPatternFrame::GetPatternTransform(nsIDOMSVGMatrix **aPatternTransform)
{
*aPatternTransform = nsnull;
nsresult rv;
// See if we need to get the value from another pattern
if (!checkURITarget(nsGkAtoms::patternTransform)) {
@ -570,21 +433,16 @@ nsSVGPatternFrame::GetPatternTransform(nsIDOMSVGMatrix **aPatternTransform)
patternElement->GetPatternTransform(getter_AddRefs(trans));
nsCOMPtr<nsIDOMSVGTransformList> lTrans;
trans->GetAnimVal(getter_AddRefs(lTrans));
lTrans->GetConsolidationMatrix(aPatternTransform);
if (!*aPatternTransform) {
nsresult rv = NS_NewSVGMatrix(aPatternTransform);
if (NS_FAILED(rv)) {
mLoopFlag = PR_FALSE;
return rv;
}
}
rv = lTrans->GetConsolidationMatrix(aPatternTransform);
if (NS_FAILED(rv) || !*aPatternTransform)
rv = NS_NewSVGMatrix(aPatternTransform);
} else {
// Yes, get it from the target
mNextPattern->GetPatternTransform(aPatternTransform);
rv = mNextPattern->GetPatternTransform(aPatternTransform);
}
mLoopFlag = PR_FALSE;
return NS_OK;
return rv;
}
NS_IMETHODIMP
@ -624,18 +482,6 @@ nsSVGPatternFrame::GetPreserveAspectRatio(nsIDOMSVGAnimatedPreserveAspectRatio
return NS_OK;
}
NS_IMETHODIMP
nsSVGPatternFrame::GetX(float *aX)
{
nsSVGLength2 *len;
if ((len = GetX()) == nsnull) {
*aX = 0.0f;
return NS_ERROR_FAILURE;
}
*aX = len->GetAnimValue(NS_STATIC_CAST(nsSVGCoordCtxProvider*, nsnull));
return NS_OK;
}
nsSVGLength2 *
nsSVGPatternFrame::GetX()
{
@ -655,18 +501,6 @@ nsSVGPatternFrame::GetX()
return rv;
}
NS_IMETHODIMP
nsSVGPatternFrame::GetY(float *aY)
{
nsSVGLength2 *len;
if ((len = GetY()) == nsnull) {
*aY = 0.0;
return NS_ERROR_FAILURE;
}
*aY = len->GetAnimValue(NS_STATIC_CAST(nsSVGCoordCtxProvider*, nsnull));
return NS_OK;
}
nsSVGLength2 *
nsSVGPatternFrame::GetY()
{
@ -686,18 +520,6 @@ nsSVGPatternFrame::GetY()
return rv;
}
NS_IMETHODIMP
nsSVGPatternFrame::GetWidth(float *aWidth)
{
nsSVGLength2 *len;
if ((len = GetWidth()) == nsnull) {
*aWidth = 0.0f;
return NS_ERROR_FAILURE;
}
*aWidth = len->GetAnimValue(NS_STATIC_CAST(nsSVGCoordCtxProvider*, nsnull));
return NS_OK;
}
nsSVGLength2 *
nsSVGPatternFrame::GetWidth()
{
@ -717,18 +539,6 @@ nsSVGPatternFrame::GetWidth()
return rv;
}
NS_IMETHODIMP
nsSVGPatternFrame::GetHeight(float *aHeight)
{
nsSVGLength2 *len;
if ((len = GetHeight()) == nsnull) {
*aHeight = 0.0f;
return NS_ERROR_FAILURE;
}
*aHeight = len->GetAnimValue(NS_STATIC_CAST(nsSVGCoordCtxProvider*, nsnull));
return NS_OK;
}
nsSVGLength2 *
nsSVGPatternFrame::GetHeight()
{
@ -819,8 +629,7 @@ nsSVGPatternFrame::GetPatternRect(nsIDOMSVGRect **patternRect,
nsSVGElement *content)
{
// Get our type
PRUint16 type;
GetPatternUnits(&type);
PRUint16 type = GetPatternUnits();
// We need to initialize our box
float x,y,width,height;
@ -847,6 +656,12 @@ nsSVGPatternFrame::GetPatternRect(nsIDOMSVGRect **patternRect,
return NS_NewSVGRect(patternRect, x, y, width, height);
}
static float
GetLengthValue(nsSVGLength2 *aLength)
{
return aLength->GetAnimValue(NS_STATIC_CAST(nsSVGCoordCtxProvider*, nsnull));
}
nsresult
nsSVGPatternFrame::ConstructCTM(nsIDOMSVGMatrix **aCTM,
nsIDOMSVGRect *callerBBox)
@ -855,8 +670,7 @@ nsSVGPatternFrame::ConstructCTM(nsIDOMSVGMatrix **aCTM,
// Begin by handling the objectBoundingBox conversion since
// this must be handled in the CTM
PRUint16 type;
GetPatternContentUnits(&type);
PRUint16 type = GetPatternContentUnits();
if (type == nsIDOMSVGPatternElement::SVG_PUNITS_OBJECTBOUNDINGBOX) {
// Use the bounding box
@ -883,13 +697,10 @@ nsSVGPatternFrame::ConstructCTM(nsIDOMSVGMatrix **aCTM,
viewRect->GetWidth(&viewBoxWidth);
if (viewBoxHeight != 0.0f && viewBoxWidth != 0.0f) {
float viewportWidth, viewportHeight;
GetWidth(&viewportWidth);
GetHeight(&viewportHeight);
float refX, refY;
GetX(&refX);
GetY(&refY);
float viewportWidth = GetLengthValue(GetWidth());
float viewportHeight = GetLengthValue(GetHeight());
float refX = GetLengthValue(GetX());
float refY = GetLengthValue(GetY());
nsCOMPtr<nsIDOMSVGAnimatedPreserveAspectRatio> par;
GetPreserveAspectRatio(getter_AddRefs(par));
@ -916,9 +727,12 @@ nsSVGPatternFrame::GetPatternMatrix(nsIDOMSVGMatrix **aCTM,
nsIDOMSVGRect *bbox,
nsIDOMSVGMatrix *callerCTM)
{
*aCTM = nsnull;
// Get the pattern transform
nsCOMPtr<nsIDOMSVGMatrix> patternTransform;
GetPatternTransform(getter_AddRefs(patternTransform));
nsresult rv = GetPatternTransform(getter_AddRefs(patternTransform));
NS_ENSURE_SUCCESS(rv, rv);
// We really want the pattern matrix to handle translations
float minx,miny;
@ -1055,8 +869,8 @@ nsIFrame* NS_NewSVGPatternFrame(nsIPresShell* aPresShell,
}
// Public function to locate the SVGPatternFrame structure pointed to by a URI
// and return a nsISVGPattern
nsresult NS_GetSVGPattern(nsISVGPattern **aPattern, nsIURI *aURI,
// and return a nsSVGPatternFrame
nsresult NS_GetSVGPattern(nsSVGPatternFrame **aPattern, nsIURI *aURI,
nsIContent *aContent,
nsIPresShell *aPresShell)
{
@ -1087,7 +901,12 @@ nsresult NS_GetSVGPattern(nsISVGPattern **aPattern, nsIURI *aURI,
NS_WARNING("Pattern child references pattern!");
return NS_ERROR_FAILURE;
}
return result->QueryInterface(NS_GET_IID(nsISVGPattern), (void **)aPattern);
if (result->GetType() == nsLayoutAtoms::svgPatternFrame) {
*aPattern = NS_STATIC_CAST(nsSVGPatternFrame*, result);
return NS_OK;
}
return NS_ERROR_FAILURE;
}
#ifdef DEBUG_scooter

173
layout/svg/base/src/nsSVGPatternFrame.h Normal file
Просмотреть файл

@ -0,0 +1,173 @@
/* -*- 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 the Mozilla SVG project.
*
* The Initial Developer of the Original Code is
* Scooter Morris.
* Portions created by the Initial Developer are Copyright (C) 2005
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Scooter Morris <scootermorris@comcast.net>
*
* Alternatively, the contents of this file may be used under the terms of
* either 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 __NS_SVGPATTERNFRAME_H__
#define __NS_SVGPATTERNFRAME_H__
#include "nsSVGDefsFrame.h"
#include "nsSVGValue.h"
#include "nsISVGValueObserver.h"
#include "nsWeakReference.h"
#include "nsIDOMSVGAnimatedString.h"
#include "nsIDOMSVGMatrix.h"
class nsIDOMSVGAnimatedPreserveAspectRatio;
class nsIFrame;
class nsSVGLength2;
class nsSVGElement;
typedef nsSVGDefsFrame nsSVGPatternFrameBase;
class nsSVGPatternFrame : public nsSVGPatternFrameBase,
public nsSVGValue,
public nsISVGValueObserver,
public nsSupportsWeakReference
{
public:
friend nsIFrame* NS_NewSVGPatternFrame(nsIPresShell* aPresShell,
nsIContent* aContent,
nsStyleContext* aContext);
friend nsresult NS_GetSVGPatternFrame(nsIFrame** result,
nsIURI* aURI,
nsIContent* aContent,
nsIPresShell* aPresShell);
nsSVGPatternFrame(nsStyleContext* aContext) : nsSVGPatternFrameBase(aContext) {}
nsresult PaintPattern(nsISVGRendererCanvas *canvas,
nsISVGRendererSurface **surface,
nsIDOMSVGMatrix **patternMatrix,
nsSVGGeometryFrame *aSource);
// nsISupports interface:
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; }
NS_IMETHOD_(nsrefcnt) Release() { return NS_OK; }
// nsISVGValue interface:
NS_IMETHOD SetValueString(const nsAString &aValue) { return NS_OK; }
NS_IMETHOD GetValueString(nsAString& aValue) {
return NS_ERROR_NOT_IMPLEMENTED;
}
// nsISVGValueObserver interface:
NS_IMETHOD WillModifySVGObservable(nsISVGValue* observable,
nsISVGValue::modificationType aModType);
NS_IMETHOD DidModifySVGObservable(nsISVGValue* observable,
nsISVGValue::modificationType aModType);
// nsISVGContainerFrame interface:
already_AddRefed<nsIDOMSVGMatrix> GetCanvasTM();
already_AddRefed<nsSVGCoordCtxProvider> GetCoordContextProvider();
NS_IMETHOD GetBBox(nsIDOMSVGRect **aRect);
// nsIFrame interface:
NS_IMETHOD DidSetStyleContext();
NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);
/**
* Get the "type" of the frame
*
* @see nsLayoutAtoms::svgPatternFrame
*/
virtual nsIAtom* GetType() const;
virtual PRBool IsFrameOfType(PRUint32 aFlags) const;
#ifdef DEBUG
// nsIFrameDebug interface:
NS_IMETHOD GetFrameName(nsAString& aResult) const
{
return MakeFrameName(NS_LITERAL_STRING("SVGPattern"), aResult);
}
#endif // DEBUG
protected:
virtual ~nsSVGPatternFrame();
// Internal methods for handling referenced patterns
PRBool checkURITarget(nsIAtom *);
PRBool checkURITarget();
//
nsSVGLength2 *GetX();
nsSVGLength2 *GetY();
nsSVGLength2 *GetWidth();
nsSVGLength2 *GetHeight();
PRUint16 GetPatternUnits();
PRUint16 GetPatternContentUnits();
nsresult GetPatternTransform(nsIDOMSVGMatrix **retval);
NS_IMETHOD GetPreserveAspectRatio(nsIDOMSVGAnimatedPreserveAspectRatio
**aPreserveAspectRatio);
NS_IMETHOD GetPatternFirstChild(nsIFrame **kid);
NS_IMETHOD GetViewBox(nsIDOMSVGRect * *aMatrix);
nsresult GetPatternRect(nsIDOMSVGRect **patternRect, nsIDOMSVGRect *bbox,
nsSVGElement *content);
nsresult GetPatternMatrix(nsIDOMSVGMatrix **aCTM,
nsIDOMSVGRect *bbox,
nsIDOMSVGMatrix *callerCTM);
nsresult ConstructCTM(nsIDOMSVGMatrix **ctm, nsIDOMSVGRect *callerBBox);
nsresult CreateSurface(nsISVGRendererSurface **aSurface);
nsresult GetCallerGeometry(nsIDOMSVGMatrix **aCTM,
nsIDOMSVGRect **aBBox,
nsSVGElement **aContent,
nsSVGGeometryFrame *aSource);
//
private:
nsCOMPtr<nsIDOMSVGRect> mBBox;
// this is a *temporary* reference to the frame of the element currently
// referencing our pattern. This must be termporary because different
// referencing frames will all reference this one fram
nsSVGGeometryFrame *mSource;
nsCOMPtr<nsIDOMSVGMatrix> mCTM;
protected:
nsSVGPatternFrame *mNextPattern;
nsCOMPtr<nsIDOMSVGAnimatedString> mHref;
PRPackedBool mLoopFlag;
};
#endif

1
layout/svg/renderer/public/Makefile.in
Просмотреть файл

@ -49,7 +49,6 @@ XPIDLSRCS = \
nsISVGGlyphMetricsSource.idl \
nsISVGGradient.idl \
nsISVGPathGeometrySource.idl \
nsISVGPattern.idl \
nsISVGRectangleSink.idl \
nsISVGRenderer.idl \
nsISVGRendererCanvas.idl \

0
layout/svg/renderer/public/nsISVGPattern.idl
Просмотреть файл

1
layout/svg/renderer/src/cairo/Makefile.in
Просмотреть файл

@ -94,6 +94,7 @@ LOCAL_INCLUDES = \
-I$(topsrcdir)/layout/generic \
-I$(topsrcdir)/layout/svg/base/src \
-I$(topsrcdir)/layout/xul/base/src \
-I$(topsrcdir)/content/svg/content/src \
$(NULL)
ifdef MOZ_ENABLE_GTK

5
layout/svg/renderer/src/cairo/nsSVGCairoGlyphGeometry.cpp
Просмотреть файл

@ -58,7 +58,6 @@
#include "nsISVGGradient.h"
#include "nsSVGCairoGradient.h"
#include "nsISVGPattern.h"
#include "nsISVGCairoSurface.h"
#include "nsSVGCairoPattern.h"
#include "nsIDOMSVGRect.h"
@ -258,7 +257,7 @@ nsSVGCairoGlyphGeometry::Render(nsSVGGlyphFrame *aSource,
cairo_pattern_destroy(gradient);
}
} else if (fillServerType == nsSVGGeometryFrame::PAINT_TYPE_PATTERN) {
nsISVGPattern *aPat;
nsSVGPatternFrame *aPat;
aSource->GetFillPattern(&aPat);
// Paint the pattern -- note that because we will call back into the
// layout layer to paint, we need to pass the canvas, not just the context
@ -296,7 +295,7 @@ nsSVGCairoGlyphGeometry::Render(nsSVGGlyphFrame *aSource,
cairo_pattern_destroy(gradient);
}
} else if (strokeServerType == nsSVGGeometryFrame::PAINT_TYPE_PATTERN) {
nsISVGPattern *aPat;
nsSVGPatternFrame *aPat;
aSource->GetStrokePattern(&aPat);
// Paint the pattern -- note that because we will call back into the
// layout layer to paint, we need to pass the canvas, not just the context

5
layout/svg/renderer/src/cairo/nsSVGCairoPathGeometry.cpp
Просмотреть файл

@ -54,7 +54,6 @@
#include "nsSVGCairoRegion.h"
#include "nsISVGGradient.h"
#include "nsSVGCairoGradient.h"
#include "nsISVGPattern.h"
#include "nsISVGCairoSurface.h"
#include "nsSVGCairoPattern.h"
#include "nsIDOMSVGRect.h"
@ -261,7 +260,7 @@ nsSVGCairoPathGeometry::Render(nsSVGPathGeometryFrame *aSource,
cairo_pattern_destroy(gradient);
}
} else if (fillServerType == nsSVGGeometryFrame::PAINT_TYPE_PATTERN) {
nsISVGPattern *aPat;
nsSVGPatternFrame *aPat;
aSource->GetFillPattern(&aPat);
// Paint the pattern -- note that because we will call back into the
// layout layer to paint, we need to pass the canvas, not just the context
@ -298,7 +297,7 @@ nsSVGCairoPathGeometry::Render(nsSVGPathGeometryFrame *aSource,
cairo_pattern_destroy(gradient);
}
} else if (strokeServerType == nsSVGGeometryFrame::PAINT_TYPE_PATTERN) {
nsISVGPattern *aPat;
nsSVGPatternFrame *aPat;
aSource->GetStrokePattern(&aPat);
// Paint the pattern -- note that because we will call back into the
// layout layer to paint, we need to pass the canvas, not just the context

4
layout/svg/renderer/src/cairo/nsSVGCairoPattern.cpp
Просмотреть файл

@ -52,7 +52,7 @@
#include "nsSVGCairoCanvas.h"
#include "nsSVGCairoSurface.h"
#include "nsSVGCairoPattern.h"
#include "nsISVGPattern.h"
#include "nsSVGPatternFrame.h"
#include "nsSVGGeometryFrame.h"
#ifdef DEBUG
@ -78,7 +78,7 @@ void dumpPattern(nsISVGCairoSurface *surf);
#endif
cairo_pattern_t *
CairoPattern(nsISVGRendererCanvas *canvas, nsISVGPattern *aPat,
CairoPattern(nsISVGRendererCanvas *canvas, nsSVGPatternFrame *aPat,
nsSVGGeometryFrame *aSource, nsISVGRendererSurface **aSurface)
{
*aSurface = nsnull;

60
layout/svg/renderer/src/cairo/nsSVGCairoPattern.h
Просмотреть файл

@ -1,60 +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 the Mozilla SVG Cairo Renderer project.
*
* The Initial Developer of the Original Code is
* Scooter Morris.
* Portions created by the Initial Developer are Copyright (C) 2005
* the Initial Developer. All Rights Reserved.
*
* Parts of this file contain code derived from the following files(s)
* of the Mozilla SVG project (these parts are Copyright (C) by their
* respective copyright-holders):
* layout/svg/renderer/src/cairo/nsSVGCairoGradient.h
*
* Contributor(s):
* Scooter Morris <scootermorris@comcast.net>
*
* 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 __NS_SVGCAIROPATTERN_H__
#define __NS_SVGCAIROPATTERN_H__
#include "cairo.h"
class nsISVGRendererCanvas;
class nsISVGPattern;
class nsSVGGeometryFrame;
class nsISVGRendererSurface;
cairo_pattern_t *
CairoPattern(nsISVGRendererCanvas *canvas,
nsISVGPattern *aPat,
nsSVGGeometryFrame *aSource,
nsISVGRendererSurface **aSurface);
#endif