diff -r 000000000000 -r 6474c204b198 layout/svg/nsSVGClipPathFrame.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/layout/svg/nsSVGClipPathFrame.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,111 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __NS_SVGCLIPPATHFRAME_H__
+#define __NS_SVGCLIPPATHFRAME_H__
+
+#include "mozilla/Attributes.h"
+#include "gfxMatrix.h"
+#include "nsSVGContainerFrame.h"
+#include "nsSVGUtils.h"
+
+class nsRenderingContext;
+class nsISVGChildFrame;
+
+typedef nsSVGContainerFrame nsSVGClipPathFrameBase;
+
+class nsSVGClipPathFrame : public nsSVGClipPathFrameBase
+{
+  friend nsIFrame*
+  NS_NewSVGClipPathFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
+protected:
+  nsSVGClipPathFrame(nsStyleContext* aContext)
+    : nsSVGClipPathFrameBase(aContext)
+    , mInUse(false)
+  {
+    AddStateBits(NS_FRAME_IS_NONDISPLAY);
+  }
+
+public:
+  NS_DECL_FRAMEARENA_HELPERS
+
+  // nsIFrame methods:
+  virtual void BuildDisplayList(nsDisplayListBuilder*   aBuilder,
+                                const nsRect&           aDirtyRect,
+                                const nsDisplayListSet& aLists) MOZ_OVERRIDE {}
+
+  // nsSVGClipPathFrame methods:
+  nsresult ClipPaint(nsRenderingContext* aContext,
+                     nsIFrame* aParent,
+                     const gfxMatrix &aMatrix);
+
+  bool ClipHitTest(nsIFrame* aParent,
+                     const gfxMatrix &aMatrix,
+                     const nsPoint &aPoint);
+
+  // Check if this clipPath is made up of more than one geometry object.
+  // If so, the clipping API in cairo isn't enough and we need to use
+  // mask based clipping.
+  bool IsTrivial(nsISVGChildFrame **aSingleChild = nullptr);
+
+  bool IsValid();
+
+  // nsIFrame interface:
+  virtual nsresult AttributeChanged(int32_t         aNameSpaceID,
+                                    nsIAtom*        aAttribute,
+                                    int32_t         aModType) MOZ_OVERRIDE;
+
+  virtual void Init(nsIContent*      aContent,
+                    nsIFrame*        aParent,
+                    nsIFrame*        aPrevInFlow) MOZ_OVERRIDE;
+
+  /**
+   * Get the "type" of the frame
+   *
+   * @see nsGkAtoms::svgClipPathFrame
+   */
+  virtual nsIAtom* GetType() const MOZ_OVERRIDE;
+
+#ifdef DEBUG_FRAME_DUMP
+  virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
+  {
+    return MakeFrameName(NS_LITERAL_STRING("SVGClipPath"), aResult);
+  }
+#endif
+
+ private:
+  // A helper class to allow us to paint clip paths safely. The helper
+  // automatically sets and clears the mInUse flag on the clip path frame
+  // (to prevent nasty reference loops). It's easy to mess this up
+  // and break things, so this helper makes the code far more robust.
+  class MOZ_STACK_CLASS AutoClipPathReferencer
+  {
+  public:
+    AutoClipPathReferencer(nsSVGClipPathFrame *aFrame
+                           MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
+       : mFrame(aFrame) {
+      MOZ_GUARD_OBJECT_NOTIFIER_INIT;
+      NS_ASSERTION(!mFrame->mInUse, "reference loop!");
+      mFrame->mInUse = true;
+    }
+    ~AutoClipPathReferencer() {
+      mFrame->mInUse = false;
+    }
+  private:
+    nsSVGClipPathFrame *mFrame;
+    MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
+  };
+
+  nsIFrame *mClipParent;
+  nsAutoPtr<gfxMatrix> mClipParentMatrix;
+  // recursion prevention flag
+  bool mInUse;
+
+  // nsSVGContainerFrame methods:
+  virtual gfxMatrix GetCanvasTM(uint32_t aFor,
+                                nsIFrame* aTransformRoot = nullptr) MOZ_OVERRIDE;
+};
+
+#endif