Commit 058049a7 authored by longsonr's avatar longsonr
Browse files

Bug 1649739 - Move SVG paint server and clipPath classes to the mozilla namespace r=dholbert 

Differential Revision: https://phabricator.services.mozilla.com/D81858
parent 0ee37644

dom/svg/SVGClipPathElement.h

+3 −3
Original line number Diff line number Diff line
@@ -10,18 +10,18 @@ 
#include "SVGAnimatedEnumeration.h"

#include "mozilla/dom/SVGTransformableElement.h"



class nsSVGClipPathFrame;



nsresult NS_NewSVGClipPathElement(

    nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);



namespace mozilla {

class SVGClipPathFrame;



namespace dom {



typedef SVGTransformableElement SVGClipPathElementBase;



class SVGClipPathElement final : public SVGClipPathElementBase {

  friend class ::nsSVGClipPathFrame;

  friend class mozilla::SVGClipPathFrame;



 protected:

  friend nsresult(::NS_NewSVGClipPathElement(

dom/svg/SVGGradientElement.h

+7 −7
Original line number Diff line number Diff line
@@ -14,16 +14,16 @@ 
#include "mozilla/dom/SVGElement.h"

#include "mozilla/UniquePtr.h"



class nsSVGGradientFrame;

class nsSVGLinearGradientFrame;

class nsSVGRadialGradientFrame;



nsresult NS_NewSVGLinearGradientElement(

    nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);

nsresult NS_NewSVGRadialGradientElement(

    nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);



namespace mozilla {

class SVGGradientFrame;

class SVGLinearGradientFrame;

class SVGRadialGradientFrame;



namespace dom {



class DOMSVGAnimatedTransformList;
@@ -33,7 +33,7 @@ class DOMSVGAnimatedTransformList; 
typedef SVGElement SVGGradientElementBase;



class SVGGradientElement : public SVGGradientElementBase {

  friend class ::nsSVGGradientFrame;

  friend class mozilla::SVGGradientFrame;



 protected:

  explicit SVGGradientElement(
@@ -81,7 +81,7 @@ class SVGGradientElement : public SVGGradientElementBase { 
typedef SVGGradientElement SVGLinearGradientElementBase;



class SVGLinearGradientElement : public SVGLinearGradientElementBase {

  friend class ::nsSVGLinearGradientFrame;

  friend class mozilla::SVGLinearGradientFrame;

  friend nsresult(::NS_NewSVGLinearGradientElement(

      nsIContent** aResult,

      already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo));
@@ -114,7 +114,7 @@ class SVGLinearGradientElement : public SVGLinearGradientElementBase { 
typedef SVGGradientElement SVGRadialGradientElementBase;



class SVGRadialGradientElement : public SVGRadialGradientElementBase {

  friend class ::nsSVGRadialGradientFrame;

  friend class mozilla::SVGRadialGradientFrame;

  friend nsresult(::NS_NewSVGRadialGradientElement(

      nsIContent** aResult,

      already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo));

dom/svg/SVGPatternElement.h

+3 −3
Original line number Diff line number Diff line
@@ -16,19 +16,19 @@ 
#include "mozilla/dom/SVGElement.h"

#include "mozilla/UniquePtr.h"



class nsSVGPatternFrame;



nsresult NS_NewSVGPatternElement(

    nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);



namespace mozilla {

class SVGPatternFrame;



namespace dom {

class DOMSVGAnimatedTransformList;



typedef SVGElement SVGPatternElementBase;



class SVGPatternElement final : public SVGPatternElementBase {

  friend class ::nsSVGPatternFrame;

  friend class mozilla::SVGPatternFrame;



 protected:

  friend nsresult(::NS_NewSVGPatternElement(

layout/generic/FrameClasses.py

+7 −7
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ FRAME_CLASSES = [ 
    Frame("nsStackFrame", "Box", NOT_LEAF),

    Frame("nsSubDocumentFrame", "SubDocument", LEAF),

    Frame("SVGAFrame", "SVGA", NOT_LEAF),

    Frame("nsSVGClipPathFrame", "SVGClipPath", NOT_LEAF),

    Frame("SVGClipPathFrame", "SVGClipPath", NOT_LEAF),

    Frame("nsSVGContainerFrame", "None", NOT_LEAF),

    Frame("SVGFEContainerFrame", "SVGFEContainer", NOT_LEAF),

    Frame("SVGFEImageFrame", "SVGFEImage", LEAF),
@@ -113,15 +113,15 @@ FRAME_CLASSES = [ 
    Frame("SVGGFrame", "SVGG", NOT_LEAF),

    Frame("SVGImageFrame", "SVGImage", LEAF),

    Frame("SVGInnerSVGFrame", "SVGInnerSVG", NOT_LEAF),

    Frame("nsSVGLinearGradientFrame", "SVGLinearGradient", NOT_LEAF),

    Frame("SVGLinearGradientFrame", "SVGLinearGradient", NOT_LEAF),

    Frame("SVGMarkerFrame", "SVGMarker", NOT_LEAF),

    Frame("SVGMarkerAnonChildFrame", "SVGMarkerAnonChild", NOT_LEAF),

    Frame("SVGMaskFrame", "SVGMask", NOT_LEAF),

    Frame("nsSVGOuterSVGFrame", "SVGOuterSVG", NOT_LEAF),

    Frame("nsSVGOuterSVGAnonChildFrame", "SVGOuterSVGAnonChild", NOT_LEAF),

    Frame("nsSVGPatternFrame", "SVGPattern", NOT_LEAF),

    Frame("nsSVGRadialGradientFrame", "SVGRadialGradient", NOT_LEAF),

    Frame("nsSVGStopFrame", "SVGStop", LEAF),

    Frame("SVGPatternFrame", "SVGPattern", NOT_LEAF),

    Frame("SVGRadialGradientFrame", "SVGRadialGradient", NOT_LEAF),

    Frame("SVGStopFrame", "SVGStop", LEAF),

    Frame("nsSVGSwitchFrame", "SVGSwitch", NOT_LEAF),

    Frame("SVGSymbolFrame", "SVGSymbol", NOT_LEAF),

    Frame("SVGTextFrame", "SVGText", NOT_LEAF),
@@ -155,8 +155,8 @@ FRAME_CLASSES = [ 
    AbstractFrame("nsRubyContentFrame"),

    AbstractFrame("nsSplittableFrame"),

    AbstractFrame("nsSVGDisplayContainerFrame"),

    AbstractFrame("nsSVGGradientFrame"),

    AbstractFrame("nsSVGPaintServerFrame"),

    AbstractFrame("SVGGradientFrame"),

    AbstractFrame("SVGPaintServerFrame"),



    # Interfaces (for FrameIID use)

    AbstractFrame("nsIAnonymousContentCreator"),

layout/generic/nsIFrame.cpp

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ 
#include "nsFrameSelection.h"

#include "nsGkAtoms.h"

#include "nsCSSAnonBoxes.h"

#include "nsCSSClipPathInstance.h"

#include "nsCanvasFrame.h"



#include "nsFrameTraversal.h"
@@ -105,6 +104,7 @@ 
#include "nsWindowSizes.h"



#include "mozilla/AsyncEventDispatcher.h"

#include "mozilla/CSSClipPathInstance.h"

#include "mozilla/EffectCompositor.h"

#include "mozilla/EffectSet.h"

#include "mozilla/EventListenerManager.h"
@@ -3012,7 +3012,7 @@ static Maybe<nsRect> ComputeClipForMaskItem(nsDisplayListBuilder* aBuilder, 
  Maybe<gfxRect> combinedClip;

  if (maskUsage.shouldApplyBasicShapeOrPath) {

    Maybe<Rect> result =

        nsCSSClipPathInstance::GetBoundingRectForBasicShapeOrPathClip(

        CSSClipPathInstance::GetBoundingRectForBasicShapeOrPathClip(

            aMaskedFrame, svgReset->mClipPath);

    if (result) {

      combinedClip = Some(ThebesRect(*result));