зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1049256, part 2 - Get rid of nsISVGChildFrame::FOR_HIT_TESTING. r=longsonr
This commit is contained in:
Родитель
f35f4a70d1
Коммит
ca40beec75
|
@ -3432,8 +3432,11 @@ SVGTextFrame::FindCloserFrameForSelection(
|
|||
userRect.Scale(devPxPerCSSPx);
|
||||
|
||||
if (!userRect.IsEmpty()) {
|
||||
nsRect rect = nsSVGUtils::ToCanvasBounds(userRect.ToThebesRect(),
|
||||
GetCanvasTM(FOR_HIT_TESTING),
|
||||
gfxMatrix m;
|
||||
if (!NS_SVGDisplayListHitTestingEnabled()) {
|
||||
m = GetCanvasTM(FOR_OUTERSVG_TM);
|
||||
}
|
||||
nsRect rect = nsSVGUtils::ToCanvasBounds(userRect.ToThebesRect(), m,
|
||||
presContext);
|
||||
|
||||
if (nsLayoutUtils::PointIsCloserToRect(aPoint, rect,
|
||||
|
@ -3893,9 +3896,6 @@ SVGTextFrame::GetCanvasTM(uint32_t aFor, nsIFrame* aTransformRoot)
|
|||
if (aFor == FOR_PAINTING && NS_SVGDisplayListPaintingEnabled()) {
|
||||
return nsSVGIntegrationUtils::GetCSSPxToDevPxMatrix(this);
|
||||
}
|
||||
if (aFor == FOR_HIT_TESTING && NS_SVGDisplayListHitTestingEnabled()) {
|
||||
return gfxMatrix();
|
||||
}
|
||||
}
|
||||
if (!mCanvasTM) {
|
||||
NS_ASSERTION(GetParent(), "null parent");
|
||||
|
|
|
@ -88,7 +88,6 @@ public:
|
|||
*/
|
||||
enum RequestingCanvasTMFor {
|
||||
FOR_PAINTING = 1,
|
||||
FOR_HIT_TESTING,
|
||||
FOR_OUTERSVG_TM
|
||||
};
|
||||
|
||||
|
|
|
@ -138,9 +138,6 @@ nsSVGAFrame::GetCanvasTM(uint32_t aFor, nsIFrame* aTransformRoot)
|
|||
if (aFor == FOR_PAINTING && NS_SVGDisplayListPaintingEnabled()) {
|
||||
return nsSVGIntegrationUtils::GetCSSPxToDevPxMatrix(this);
|
||||
}
|
||||
if (aFor == FOR_HIT_TESTING && NS_SVGDisplayListHitTestingEnabled()) {
|
||||
return gfxMatrix();
|
||||
}
|
||||
}
|
||||
if (!mCanvasTM) {
|
||||
NS_ASSERTION(GetParent(), "null parent");
|
||||
|
|
|
@ -487,9 +487,6 @@ nsSVGForeignObjectFrame::GetCanvasTM(uint32_t aFor, nsIFrame* aTransformRoot)
|
|||
if (aFor == FOR_PAINTING && NS_SVGDisplayListPaintingEnabled()) {
|
||||
return nsSVGIntegrationUtils::GetCSSPxToDevPxMatrix(this);
|
||||
}
|
||||
if (aFor == FOR_HIT_TESTING && NS_SVGDisplayListHitTestingEnabled()) {
|
||||
return gfxMatrix();
|
||||
}
|
||||
}
|
||||
if (!mCanvasTM) {
|
||||
NS_ASSERTION(GetParent(), "null parent");
|
||||
|
|
|
@ -71,9 +71,6 @@ nsSVGGFrame::GetCanvasTM(uint32_t aFor, nsIFrame* aTransformRoot)
|
|||
if (aFor == FOR_PAINTING && NS_SVGDisplayListPaintingEnabled()) {
|
||||
return nsSVGIntegrationUtils::GetCSSPxToDevPxMatrix(this);
|
||||
}
|
||||
if (aFor == FOR_HIT_TESTING && NS_SVGDisplayListHitTestingEnabled()) {
|
||||
return gfxMatrix();
|
||||
}
|
||||
}
|
||||
if (!mCanvasTM) {
|
||||
NS_ASSERTION(GetParent(), "null parent");
|
||||
|
|
|
@ -53,9 +53,6 @@ nsSVGGenericContainerFrame::GetCanvasTM(uint32_t aFor,
|
|||
if (aFor == FOR_PAINTING && NS_SVGDisplayListPaintingEnabled()) {
|
||||
return nsSVGIntegrationUtils::GetCSSPxToDevPxMatrix(this);
|
||||
}
|
||||
if (aFor == FOR_HIT_TESTING && NS_SVGDisplayListHitTestingEnabled()) {
|
||||
return gfxMatrix();
|
||||
}
|
||||
}
|
||||
|
||||
NS_ASSERTION(GetParent(), "null parent");
|
||||
|
|
|
@ -298,9 +298,6 @@ nsSVGInnerSVGFrame::GetCanvasTM(uint32_t aFor, nsIFrame* aTransformRoot)
|
|||
if (aFor == FOR_PAINTING && NS_SVGDisplayListPaintingEnabled()) {
|
||||
return nsSVGIntegrationUtils::GetCSSPxToDevPxMatrix(this);
|
||||
}
|
||||
if (aFor == FOR_HIT_TESTING && NS_SVGDisplayListHitTestingEnabled()) {
|
||||
return gfxMatrix();
|
||||
}
|
||||
}
|
||||
if (!mCanvasTM) {
|
||||
NS_ASSERTION(GetParent(), "null parent");
|
||||
|
|
|
@ -831,9 +831,6 @@ nsSVGOuterSVGFrame::GetCanvasTM(uint32_t aFor, nsIFrame* aTransformRoot)
|
|||
if (aFor == FOR_PAINTING && NS_SVGDisplayListPaintingEnabled()) {
|
||||
return nsSVGIntegrationUtils::GetCSSPxToDevPxMatrix(this);
|
||||
}
|
||||
if (aFor == FOR_HIT_TESTING && NS_SVGDisplayListHitTestingEnabled()) {
|
||||
return gfxMatrix();
|
||||
}
|
||||
}
|
||||
if (!mCanvasTM) {
|
||||
NS_ASSERTION(!aTransformRoot, "transform root will be ignored here");
|
||||
|
|
|
@ -552,9 +552,6 @@ nsSVGPathGeometryFrame::GetCanvasTM(uint32_t aFor, nsIFrame* aTransformRoot)
|
|||
if (aFor == FOR_PAINTING && NS_SVGDisplayListPaintingEnabled()) {
|
||||
return nsSVGIntegrationUtils::GetCSSPxToDevPxMatrix(this);
|
||||
}
|
||||
if (aFor == FOR_HIT_TESTING && NS_SVGDisplayListHitTestingEnabled()) {
|
||||
return gfxMatrix();
|
||||
}
|
||||
}
|
||||
|
||||
NS_ASSERTION(GetParent(), "null parent");
|
||||
|
|
|
@ -372,10 +372,6 @@ nsSVGUtils::GetCanvasTM(nsIFrame *aFrame, uint32_t aFor,
|
|||
// XXX yuck, we really need a common interface for GetCanvasTM
|
||||
|
||||
if (!aFrame->IsFrameOfType(nsIFrame::eSVG)) {
|
||||
if (aFor == nsISVGChildFrame::FOR_HIT_TESTING &&
|
||||
NS_SVGDisplayListHitTestingEnabled()) {
|
||||
return gfxMatrix();
|
||||
}
|
||||
return nsSVGIntegrationUtils::GetCSSPxToDevPxMatrix(aFrame);
|
||||
}
|
||||
|
||||
|
@ -385,10 +381,6 @@ nsSVGUtils::GetCanvasTM(nsIFrame *aFrame, uint32_t aFor,
|
|||
NS_SVGDisplayListPaintingEnabled()) {
|
||||
return nsSVGIntegrationUtils::GetCSSPxToDevPxMatrix(aFrame);
|
||||
}
|
||||
if (aFor == nsISVGChildFrame::FOR_HIT_TESTING &&
|
||||
NS_SVGDisplayListHitTestingEnabled()) {
|
||||
return gfxMatrix();
|
||||
}
|
||||
}
|
||||
|
||||
nsIAtom* type = aFrame->GetType();
|
||||
|
|
Загрузка…
Ссылка в новой задаче