mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-18 07:45:30 +00:00
2390d89fa5
Some notes: this does not fully bring us to compliance to the current spec. Instead, these are the fixes that I needed to make in order to make css/geometry/interfaces.html pass with the DOMPoint changes in the previous patches. I don't fully understand why that patch caused the test to fail the way it did, but it ended up being easier to fix our code than understand why the harness was falling over. The DOMQuad::QuadBounds class was the source of some confusion for me. Now that DOMRectReadOnly is a concrete class with members, I wanted to avoid wasting them. However, the spec is unclear as to whether a DOMQuad's bound's should be live -- that is because DOMQuad exposes DOMPoint, we can set its points after retrieving a QuadBounds object. Our current code is live, setting the points changes the QuadBounds. Chromium's current behavior is to never update the QuadBounds object. I've left our behavior untouched in this patch (and waste 4 doubles per QuadBounds object), but I am intending to file a bug to understand what the intent of the spec is. I wonder if the author intended the points to be DOMPointReadOnly instead. If so, we could simplify the DOMRectReadOnly code and get rid of the virtual getters, which would be nice. I also wasn't thrilled to put the DOMMatrix setters on the DOMMatrixReadOnly class, but for brevity and simplicity of implementation, I've made them public. I briefly considered making the setters protected on the ReadOnly version of the class, but I'm not convinced that having to explicitly make them public on the derived class is worth the extra copies of the names. MozReview-Commit-ID: CjdW4Nbnc6A --HG-- extra : rebase_source : 44489693afebff571a415b487e29fa6153288421
96 lines
3.0 KiB
C++
96 lines
3.0 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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/. */
|
|
|
|
#include "mozilla/dom/DOMRect.h"
|
|
|
|
#include "nsPresContext.h"
|
|
#include "mozilla/dom/DOMRectListBinding.h"
|
|
#include "mozilla/dom/DOMRectBinding.h"
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::dom;
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(DOMRectReadOnly, mParent)
|
|
NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMRectReadOnly)
|
|
NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMRectReadOnly)
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMRectReadOnly)
|
|
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
|
|
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
|
NS_INTERFACE_MAP_END
|
|
|
|
JSObject*
|
|
DOMRectReadOnly::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
|
{
|
|
MOZ_ASSERT(mParent);
|
|
return DOMRectReadOnlyBinding::Wrap(aCx, this, aGivenProto);
|
|
}
|
|
|
|
already_AddRefed<DOMRectReadOnly>
|
|
DOMRectReadOnly::Constructor(const GlobalObject& aGlobal, double aX, double aY,
|
|
double aWidth, double aHeight, ErrorResult& aRv)
|
|
{
|
|
RefPtr<DOMRectReadOnly> obj =
|
|
new DOMRectReadOnly(aGlobal.GetAsSupports(), aX, aY, aWidth, aHeight);
|
|
return obj.forget();
|
|
}
|
|
|
|
// -----------------------------------------------------------------------------
|
|
|
|
JSObject*
|
|
DOMRect::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
|
{
|
|
MOZ_ASSERT(mParent);
|
|
return DOMRectBinding::Wrap(aCx, this, aGivenProto);
|
|
}
|
|
|
|
already_AddRefed<DOMRect>
|
|
DOMRect::Constructor(const GlobalObject& aGlobal, double aX, double aY,
|
|
double aWidth, double aHeight, ErrorResult& aRv)
|
|
{
|
|
RefPtr<DOMRect> obj =
|
|
new DOMRect(aGlobal.GetAsSupports(), aX, aY, aWidth, aHeight);
|
|
return obj.forget();
|
|
}
|
|
|
|
// -----------------------------------------------------------------------------
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(DOMRectList, mParent, mArray)
|
|
|
|
NS_INTERFACE_TABLE_HEAD(DOMRectList)
|
|
NS_WRAPPERCACHE_INTERFACE_TABLE_ENTRY
|
|
NS_INTERFACE_TABLE0(DOMRectList)
|
|
NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(DOMRectList)
|
|
NS_INTERFACE_MAP_END
|
|
|
|
NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMRectList)
|
|
NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMRectList)
|
|
|
|
JSObject*
|
|
DOMRectList::WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto)
|
|
{
|
|
return mozilla::dom::DOMRectListBinding::Wrap(cx, this, aGivenProto);
|
|
}
|
|
|
|
static double
|
|
RoundFloat(double aValue)
|
|
{
|
|
return floor(aValue + 0.5);
|
|
}
|
|
|
|
void
|
|
DOMRect::SetLayoutRect(const nsRect& aLayoutRect)
|
|
{
|
|
double scale = 65536.0;
|
|
// Round to the nearest 1/scale units. We choose scale so it can be represented
|
|
// exactly by machine floating point.
|
|
double scaleInv = 1/scale;
|
|
double t2pScaled = scale/nsPresContext::AppUnitsPerCSSPixel();
|
|
double x = RoundFloat(aLayoutRect.x*t2pScaled)*scaleInv;
|
|
double y = RoundFloat(aLayoutRect.y*t2pScaled)*scaleInv;
|
|
SetRect(x, y, RoundFloat(aLayoutRect.XMost()*t2pScaled)*scaleInv - x,
|
|
RoundFloat(aLayoutRect.YMost()*t2pScaled)*scaleInv - y);
|
|
}
|