Attachment #807615 for bug #918189

Attachment #807615: Part 2: Implement constructors for DOMRect and DOMQuad for bug #918189

View | Details | Raw Unified | Return to bug 918189
Collapse All | Expand All






NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(DOMPoint, mParent)

NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(DOMPoint, AddRef)
NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(DOMPoint, Release)

already_AddRefed<DOMPoint>
DOMPoint::Constructor(const GlobalObject& aGlobal, double aX, double aY,
                      double aZ, double aW, ErrorResult& aRV)
{
  nsRefPtr<DOMPoint> obj =
    new DOMPoint(aGlobal.GetAsSupports(), aX, aY, aZ, aW);
  return obj.forget();
}

JSObject*
DOMPoint::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
{
  return DOMPointBinding::Wrap(aCx, aScope, this);
}





#define MOZILLA_DOMPOINT_H_

#include "nsWrapperCache.h"
#include "nsISupports.h"
#include "nsCycleCollectionParticipant.h"
#include "mozilla/Attributes.h"
#include "mozilla/ErrorResult.h"
#include "nsCOMPtr.h"
#include "gfxPoint.h"

namespace mozilla {
namespace dom {

class GlobalObject;

class DOMPoint MOZ_FINAL : public nsWrapperCache
{

    SetIsDOMBinding();
  }

  NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(DOMPoint)
  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(DOMPoint)

  static already_AddRefed<DOMPoint>
  Constructor(const GlobalObject& aGlobal, double aX, double aY,
              double aZ, double aW, ErrorResult& aRV);

  nsISupports* GetParentObject() const { return mParent; }
  virtual JSObject* WrapObject(JSContext* aCx,
                               JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;

  double X() const { return mX; }
  double Y() const { return mY; }
  double Z() const { return mZ; }
  double W() const { return mW; }

  gfxPoint ToGfxPoint() const
  {
    NS_ASSERTION(mW == 1.0 && mZ == 0.0, "3D points not supported");
    return gfxPoint(mX, mY);
  }

protected:
  nsCOMPtr<nsISupports> mParent;
  double mX, mY, mZ, mW;
};

}
}






 * 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/. */

#include "mozilla/dom/DOMQuad.h"

#include "mozilla/dom/DOMQuadBinding.h"
#include "mozilla/dom/DOMPoint.h"
#include "mozilla/dom/DOMRect.h"
#include "mozilla/dom/BindingDeclarations.h"
#include "gfxPoint.h"
#include <algorithm>

using namespace mozilla;
using namespace mozilla::dom;

NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_6(DOMQuad, mParent, mBounds, mPoints[0],
                                        mPoints[1], mPoints[2], mPoints[3])

}

JSObject*
DOMQuad::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
{
  return DOMQuadBinding::Wrap(aCx, aScope, this);
}

already_AddRefed<DOMQuad>
DOMQuad::Constructor(const GlobalObject& aGlobal, DOMRect& aRect, ErrorResult& aRV)
{
  gfxPoint points[4] = {
    gfxPoint(aRect.Left(), aRect.Top()),
    gfxPoint(aRect.Right(), aRect.Top()),
    gfxPoint(aRect.Right(), aRect.Bottom()),
    gfxPoint(aRect.Left(), aRect.Bottom())
  };
  nsRefPtr<DOMQuad> obj = new DOMQuad(aGlobal.GetAsSupports(), points);
  return obj.forget();
}

already_AddRefed<DOMQuad>
DOMQuad::Constructor(const GlobalObject& aGlobal, DOMPoint& aPoint1, DOMPoint& aPoint2,
                     DOMPoint& aPoint3, DOMPoint& aPoint4, ErrorResult& aRV)
{
  gfxPoint points[4] = {
    aPoint1.ToGfxPoint(),
    aPoint2.ToGfxPoint(),
    aPoint3.ToGfxPoint(),
    aPoint4.ToGfxPoint()
  };
  nsRefPtr<DOMQuad> obj = new DOMQuad(aGlobal.GetAsSupports(), points);
  return obj.forget();
}

DOMRect*
DOMQuad::Bounds() const
{
  if (!mBounds) {
    double minX = mPoints[0]->X();
    double minY = mPoints[0]->Y();
    double maxX = minX;
    double maxY = minY;






#ifndef MOZILLA_DOMQUAD_H_
#define MOZILLA_DOMQUAD_H_

#include "nsWrapperCache.h"
#include "nsISupports.h"
#include "nsCycleCollectionParticipant.h"
#include "mozilla/Attributes.h"
#include "mozilla/ErrorResult.h"
#include "nsCOMPtr.h"
#include "nsAutoPtr.h"

class gfxPoint;

namespace mozilla {
namespace dom {

class DOMRect;
class DOMPoint;
class GlobalObject;

class DOMQuad MOZ_FINAL : public nsWrapperCache
{
public:
  DOMQuad(nsISupports* aParent, gfxPoint aPoints[4]);
  ~DOMQuad();

  NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(DOMQuad)
  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(DOMQuad)

  nsISupports* GetParentObject() const { return mParent; }
  virtual JSObject* WrapObject(JSContext* aCx,
                               JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;

  static already_AddRefed<DOMQuad>
  Constructor(const GlobalObject& aGlobal, DOMRect& aRect, ErrorResult& aRV);
  static already_AddRefed<DOMQuad>
  Constructor(const GlobalObject& aGlobal, DOMPoint& aPoint1, DOMPoint& aPoint2,
              DOMPoint& aPoint3, DOMPoint& aPoint4, ErrorResult& aRV);

  DOMRect* Bounds() const;
  DOMPoint* P1() const { return mPoints[0]; }
  DOMPoint* P2() const { return mPoints[1]; }
  DOMPoint* P3() const { return mPoints[2]; }
  DOMPoint* P4() const { return mPoints[3]; }

protected:
  nsCOMPtr<nsISupports> mParent;





 * 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/. */

#include "mozilla/dom/DOMRect.h"

#include "nsPresContext.h"
#include "mozilla/dom/DOMRectListBinding.h"
#include "mozilla/dom/DOMRectBinding.h"
#include "mozilla/dom/DOMPoint.h"
#include "mozilla/dom/BindingDeclarations.h"

using namespace mozilla;
using namespace mozilla::dom;

NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(DOMRect, mParent)
NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMRect)
NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMRect)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMRect)

}

JSObject*
DOMRectList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
{
  return mozilla::dom::DOMRectListBinding::Wrap(cx, scope, this);
}

already_AddRefed<DOMRect>
DOMRect::Constructor(const GlobalObject& aGlobal, double aX, double aY,
                     double aW, double aH, ErrorResult& aRV)
{
  nsRefPtr<DOMRect> obj =
    new DOMRect(aGlobal.GetAsSupports(), aX, aY, aW, aH);
  return obj.forget();
}

static double
RoundFloat(double aValue)
{
  return floor(aValue + 0.5);
}

void
DOMRect::SetLayoutRect(const nsRect& aLayoutRect)





#include "nsIDOMClientRect.h"
#include "nsIDOMClientRectList.h"
#include "nsTArray.h"
#include "nsCOMPtr.h"
#include "nsAutoPtr.h"
#include "nsWrapperCache.h"
#include "nsCycleCollectionParticipant.h"
#include "mozilla/Attributes.h"
#include "mozilla/ErrorResult.h"

struct nsRect;

namespace mozilla {
namespace dom {

class GlobalObject;

class DOMRect MOZ_FINAL : public nsIDOMClientRect
                        , public nsWrapperCache
{
public:
  DOMRect(nsISupports* aParent)
    : mParent(aParent), mX(0.0), mY(0.0), mWidth(0.0), mHeight(0.0)
  {
    SetIsDOMBinding();

  {
    MOZ_ASSERT(mParent);
    return mParent;
  }
  virtual JSObject* WrapObject(JSContext* aCx,
                               JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;


  static already_AddRefed<DOMRect>
  Constructor(const GlobalObject& aGlobal, double aX, double aY,
              double aW, double aH, ErrorResult& aRV);

  float Left() const
  {
    return mX;
  }

  float Top() const
  {
    return mY;





    gfxPoint(aRect.Right(), aRect.Bottom()),
    gfxPoint(aRect.Left(), aRect.Bottom())
  };
  TransformCSSPoints(this, &aFrom, 4, pts, aOptions, aRv);
  nsRefPtr<DOMQuad> result = new DOMQuad(OwnerDoc(), pts);
  return result.forget();
}

static gfxPoint
DOMPointToGfxPoint(DOMPoint* aPoint)
{
  MOZ_ASSERT(aPoint->W() == 0.0, "W not supported");
  return gfxPoint(aPoint->X(), aPoint->Y());
}

already_AddRefed<DOMQuad>
nsINode::ConvertQuadFromNode(const DOMQuad& aQuad,
                             nsINode& aFrom,
                             const ConvertPointOptions& aOptions,
                             ErrorResult& aRv)
{
  gfxPoint pts[4] = {
    aQuad.P1()->ToGfxPoint(),
    aQuad.P2()->ToGfxPoint(),
    aQuad.P3()->ToGfxPoint(),
    aQuad.P4()->ToGfxPoint(),
  };
  TransformCSSPoints(this, &aFrom, 4, pts, aOptions, aRv);
  nsRefPtr<DOMQuad> result = new DOMQuad(OwnerDoc(), pts);
  return result.forget();
}

(-)a/dom/webidl/DOMQuad.webidl (+2 lines)

Line	Link Here

Lines 1-13	Link Here

/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */

/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */

/* This Source Code Form is subject to the terms of the Mozilla Public

/* 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

 * 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/. */

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

[Constructor(DOMRect rect),

 Constructor(DOMPoint p1, DOMPoint p2, DOMPoint p3, DOMPoint p4)]

interface DOMQuad

interface DOMQuad

  readonly attribute DOMPoint p1;

  readonly attribute DOMPoint p1;

  readonly attribute DOMPoint p2;

  readonly attribute DOMPoint p2;

  readonly attribute DOMPoint p3;

  readonly attribute DOMPoint p3;

  readonly attribute DOMPoint p4;

  readonly attribute DOMPoint p4;

  readonly attribute DOMRect bounds;

  readonly attribute DOMRect bounds;

};

};

(-)a/dom/webidl/DOMRect.webidl (+1 lines)

Line	Link Here

Lines 1-13	Link Here

/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */

/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */

/* This Source Code Form is subject to the terms of the Mozilla Public

/* 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

 * 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/. */

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

[Constructor(double left, double top, double width, double height)]

interface DOMRect

interface DOMRect

  readonly attribute float left;

  readonly attribute float left;

  readonly attribute float top;

  readonly attribute float top;

  readonly attribute float right;

  readonly attribute float right;

  readonly attribute float bottom;

  readonly attribute float bottom;

  readonly attribute float width;

  readonly attribute float width;

  readonly attribute float height;

  readonly attribute float height;

Return to bug 918189