зеркало из https://github.com/mozilla/pjs.git
Bug 473511. nsSVGInnerSVGFrame does not need to implement nsISVGValueObserver. r=jwatt,sr=roc
--HG-- extra : rebase_source : 7b5b4dd1c5702498a496133c643891c337ea4a42
This commit is contained in:
Родитель
67bf969724
Коммит
ed9150bebf
|
@ -36,7 +36,6 @@
|
|||
|
||||
#include "nsSVGFilterFrame.h"
|
||||
#include "nsIDocument.h"
|
||||
#include "nsISVGValueUtils.h"
|
||||
#include "nsSVGMatrix.h"
|
||||
#include "nsSVGOuterSVGFrame.h"
|
||||
#include "nsGkAtoms.h"
|
||||
|
|
|
@ -42,7 +42,6 @@
|
|||
#include "nsSVGMatrix.h"
|
||||
#include "nsGkAtoms.h"
|
||||
#include "nsSVGUtils.h"
|
||||
#include "nsISVGValueUtils.h"
|
||||
#include "nsSVGGraphicElement.h"
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
|
|
@ -40,7 +40,6 @@
|
|||
#define __NS_SVGGRADIENTFRAME_H__
|
||||
|
||||
#include "nsSVGPaintServerFrame.h"
|
||||
#include "nsISVGValueObserver.h"
|
||||
#include "nsWeakReference.h"
|
||||
#include "nsSVGElement.h"
|
||||
#include "gfxPattern.h"
|
||||
|
|
|
@ -48,7 +48,6 @@
|
|||
typedef nsSVGDisplayContainerFrame nsSVGInnerSVGFrameBase;
|
||||
|
||||
class nsSVGInnerSVGFrame : public nsSVGInnerSVGFrameBase,
|
||||
public nsISVGValueObserver,
|
||||
public nsISVGSVGFrame
|
||||
{
|
||||
friend nsIFrame*
|
||||
|
@ -58,7 +57,6 @@ protected:
|
|||
nsSVGInnerSVGFrameBase(aContext) {}
|
||||
|
||||
public:
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
NS_DECL_QUERYFRAME
|
||||
|
||||
// We don't define an AttributeChanged method since changes to the
|
||||
|
@ -87,12 +85,6 @@ public:
|
|||
// nsSVGContainerFrame methods:
|
||||
virtual already_AddRefed<nsIDOMSVGMatrix> GetCanvasTM();
|
||||
|
||||
// nsISVGValueObserver
|
||||
NS_IMETHOD WillModifySVGObservable(nsISVGValue* observable,
|
||||
nsISVGValue::modificationType aModType);
|
||||
NS_IMETHOD DidModifySVGObservable (nsISVGValue* observable,
|
||||
nsISVGValue::modificationType aModType);
|
||||
|
||||
// nsISupportsWeakReference
|
||||
// implementation inherited from nsSupportsWeakReference
|
||||
|
||||
|
@ -121,25 +113,6 @@ NS_NewSVGInnerSVGFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsStyleCo
|
|||
return new (aPresShell) nsSVGInnerSVGFrame(aContext);
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsISupports methods
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN(nsSVGInnerSVGFrame)
|
||||
NS_INTERFACE_MAP_ENTRY(nsISVGValueObserver)
|
||||
NS_INTERFACE_MAP_END
|
||||
|
||||
NS_IMETHODIMP_(nsrefcnt)
|
||||
nsSVGInnerSVGFrame::AddRef()
|
||||
{
|
||||
return 2;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP_(nsrefcnt)
|
||||
nsSVGInnerSVGFrame::Release()
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsIFrame methods
|
||||
|
||||
|
@ -362,20 +335,3 @@ nsSVGInnerSVGFrame::GetCanvasTM()
|
|||
return retval;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsISVGValueObserver methods:
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsSVGInnerSVGFrame::WillModifySVGObservable(nsISVGValue* observable,
|
||||
nsISVGValue::modificationType aModType)
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsSVGInnerSVGFrame::DidModifySVGObservable (nsISVGValue* observable,
|
||||
nsISVGValue::modificationType aModType)
|
||||
{
|
||||
NotifyViewportChange();
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
|
@ -870,28 +870,6 @@ nsSVGUtils::NotifyChildrenOfSVGChange(nsIFrame *aFrame, PRUint32 aFlags)
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
nsSVGUtils::AddObserver(nsISupports *aObserver, nsISupports *aTarget)
|
||||
{
|
||||
nsISVGValueObserver *observer = nsnull;
|
||||
nsISVGValue *v = nsnull;
|
||||
CallQueryInterface(aObserver, &observer);
|
||||
CallQueryInterface(aTarget, &v);
|
||||
if (observer && v)
|
||||
v->AddObserver(observer);
|
||||
}
|
||||
|
||||
void
|
||||
nsSVGUtils::RemoveObserver(nsISupports *aObserver, nsISupports *aTarget)
|
||||
{
|
||||
nsISVGValueObserver *observer = nsnull;
|
||||
nsISVGValue *v = nsnull;
|
||||
CallQueryInterface(aObserver, &observer);
|
||||
CallQueryInterface(aTarget, &v);
|
||||
if (observer && v)
|
||||
v->RemoveObserver(observer);
|
||||
}
|
||||
|
||||
// ************************************************************
|
||||
|
||||
class SVGPaintCallback : public nsSVGFilterPaintCallback
|
||||
|
|
|
@ -347,14 +347,6 @@ public:
|
|||
static nsIFrame *
|
||||
HitTestChildren(nsIFrame *aFrame, const nsPoint &aPoint);
|
||||
|
||||
/* Add observation of an nsISVGValue to an nsISVGValueObserver */
|
||||
static void
|
||||
AddObserver(nsISupports *aObserver, nsISupports *aTarget);
|
||||
|
||||
/* Remove observation of an nsISVGValue from an nsISVGValueObserver */
|
||||
static void
|
||||
RemoveObserver(nsISupports *aObserver, nsISupports *aTarget);
|
||||
|
||||
/*
|
||||
* Returns the CanvasTM of the indicated frame, whether it's a
|
||||
* child SVG frame, container SVG frame, or a regular frame.
|
||||
|
|
Загрузка…
Ссылка в новой задаче