Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1454622: Remove DOMQuad bounds attribute r=bzbarsky

Browse Source 
The bounds attribute has been deprecated and shown zero use, and thus this change removes it.

Differential Revision: https://phabricator.services.mozilla.com/D36005

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Kagami Sascha Rosylight 2019-06-29 02:27:47 +00:00
parent 8e0f5ebfdd
commit 29904ec6bf
8 changed files with 57 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.js
View File

@ -144,7 +144,7 @@ add_task(async function() {
for (const boundProp of
["bottom", "top", "right", "left", "width", "height", "x", "y"]) {
is(actual.bounds[boundProp], expected.bounds[boundProp],
is(actual.bounds[boundProp], expected.getBounds()[boundProp],
boundProp + " bound is equal to the one returned by getBoxQuads for " +
region + " box");
}

18
dom/base/DOMQuad.cpp
View File

@ -15,8 +15,8 @@ using namespace mozilla;
using namespace mozilla::dom;
using namespace mozilla::gfx;
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(DOMQuad, mParent, mBounds, mPoints[0],
mPoints[1], mPoints[2], mPoints[3])
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(DOMQuad, mParent, mPoints[0], mPoints[1],
mPoints[2], mPoints[3])
NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(DOMQuad, AddRef)
NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(DOMQuad, Release)
@ -87,13 +87,6 @@ void DOMQuad::GetVerticalMinMax(double* aY1, double* aY2) const {
*aY2 = y2;
}
DOMRectReadOnly* DOMQuad::Bounds() {
if (!mBounds) {
mBounds = GetBounds();
}
return mBounds;
}
already_AddRefed<DOMRectReadOnly> DOMQuad::GetBounds() const {
double x1, x2;
double y1, y2;
@ -106,13 +99,6 @@ already_AddRefed<DOMRectReadOnly> DOMQuad::GetBounds() const {
return rval.forget();
}
void DOMQuad::ToJSON(DOMQuadJSON& aInit) {
aInit.mP1.Construct(RefPtr<DOMPoint>(P1()).forget());
aInit.mP2.Construct(RefPtr<DOMPoint>(P2()).forget());
aInit.mP3.Construct(RefPtr<DOMPoint>(P3()).forget());
aInit.mP4.Construct(RefPtr<DOMPoint>(P4()).forget());
}
// https://drafts.fxtf.org/geometry/#structured-serialization
bool DOMQuad::WriteStructuredClone(JSContext* aCx,
JSStructuredCloneWriter* aWriter) const {

5
dom/base/DOMQuad.h
View File

@ -24,7 +24,6 @@ namespace dom {
class DOMRectReadOnly;
class DOMPoint;
struct DOMQuadJSON;
struct DOMPointInit;
class DOMQuad final : public nsWrapperCache {
@ -51,7 +50,6 @@ class DOMQuad final : public nsWrapperCache {
const DOMRectReadOnly& aRect,
ErrorResult& aRV);
DOMRectReadOnly* Bounds();
already_AddRefed<DOMRectReadOnly> GetBounds() const;
DOMPoint* P1() const { return mPoints[0]; }
DOMPoint* P2() const { return mPoints[1]; }
@ -60,8 +58,6 @@ class DOMQuad final : public nsWrapperCache {
DOMPoint* Point(uint32_t aIndex) const { return mPoints[aIndex]; }
void ToJSON(DOMQuadJSON& aInit);
bool WriteStructuredClone(JSContext* aCx,
JSStructuredCloneWriter* aWriter) const;
@ -75,7 +71,6 @@ class DOMQuad final : public nsWrapperCache {
nsCOMPtr<nsISupports> mParent;
RefPtr<DOMPoint> mPoints[4];
RefPtr<DOMRectReadOnly> mBounds;
};
} // namespace dom

1
dom/locales/en-US/chrome/dom/dom.properties
View File

@ -359,7 +359,6 @@ ProximityEventWarning=Use of the proximity sensor is deprecated.
AmbientLightEventWarning=Use of the ambient light sensor is deprecated.
# LOCALIZATION NOTE: Do not translate "storage", "indexedDB.open" and "navigator.storage.persist()".
IDBOpenDBOptions_StorageTypeWarning=The ‘storage’ attribute in options passed to indexedDB.open is deprecated and will soon be removed. To get persistent storage, please use navigator.storage.persist() instead.
DOMQuadBoundsAttrWarning=DOMQuad.bounds is deprecated in favor of DOMQuad.getBounds()
UnsupportedEntryTypesIgnored=Ignoring unsupported entryTypes: %S.
AllEntryTypesIgnored=No valid entryTypes; aborting registration.

11
dom/webidl/DOMQuad.webidl
View File

@ -23,16 +23,7 @@ interface DOMQuad {
[SameObject] readonly attribute DOMPoint p4;
[NewObject] DOMRectReadOnly getBounds();
[SameObject, Deprecated=DOMQuadBoundsAttr] readonly attribute DOMRectReadOnly bounds;
DOMQuadJSON toJSON();
};
dictionary DOMQuadJSON {
DOMPoint p1;
DOMPoint p2;
DOMPoint p3;
DOMPoint p4;
[Default] object toJSON();
};
dictionary DOMQuadInit {

94
layout/base/tests/test_getBoxQuads_convertPointRectQuad.html
View File

@ -68,8 +68,8 @@ function checkConvertPoints(fromStr, options, x1, y1, x2, y2, x3, y3, x4, y4) {
var selfQuads = eval(fromStr).getBoxQuads(
{box:options.box == "" ? "border" : options.box,
relativeTo:eval(fromStr)});
var boxWidth = selfQuads[0].bounds.width;
var boxHeight = selfQuads[0].bounds.height;
var boxWidth = selfQuads[0].getBounds().width;
var boxHeight = selfQuads[0].getBounds().height;
var convertTopLeftPointExpr = makePointExpr(fromStr, options, 0, 0);
var topLeft = eval(convertTopLeftPointExpr);
@ -96,8 +96,8 @@ function checkConvertRect(fromStr, options, x1, y1, x2, y2, x3, y3, x4, y4) {
var selfQuads = eval(fromStr).getBoxQuads(
{box:options.box == "" ? "border" : options.box,
relativeTo:eval(fromStr)});
var boxWidth = selfQuads[0].bounds.width;
var boxHeight = selfQuads[0].bounds.height;
var boxWidth = selfQuads[0].getBounds().width;
var boxHeight = selfQuads[0].getBounds().height;
var convertPointOptionParts = [];
if ('box' in options) {
@ -125,8 +125,8 @@ function checkConvertQuad(fromStr, options, x1, y1, x2, y2, x3, y3, x4, y4) {
var selfQuads = eval(fromStr).getBoxQuads(
{box:options.box == "" ? "border" : options.box,
relativeTo:eval(fromStr)});
var boxWidth = selfQuads[0].bounds.width;
var boxHeight = selfQuads[0].bounds.height;
var boxWidth = selfQuads[0].getBounds().width;
var boxHeight = selfQuads[0].getBounds().height;
var convertPointOptionParts = [];
if ('box' in options) {
@ -164,10 +164,10 @@ function checkQuadIsRect(fromStr, options, x, y, w, h) {
isApprox(q.p4.x, x, quadsExpr + " checking quad.p4.x", options);
isApprox(q.p4.y, y + h, quadsExpr + " checking quad.p4.y", options);
isApprox(q.bounds.left, x, quadsExpr + " checking quad.bounds.left", options);
isApprox(q.bounds.top, y, quadsExpr + " checking quad.bounds.top", options);
isApprox(q.bounds.width, w, quadsExpr + " checking quad.bounds.width", options);
isApprox(q.bounds.height, h, quadsExpr + " checking quad.bounds.height", options);
isApprox(q.getBounds().left, x, quadsExpr + " checking quad.getBounds().left", options);
isApprox(q.getBounds().top, y, quadsExpr + " checking quad.getBounds().top", options);
isApprox(q.getBounds().width, w, quadsExpr + " checking quad.getBounds().width", options);
isApprox(q.getBounds().height, h, quadsExpr + " checking quad.getBounds().height", options);
checkConvertPoints(fromStr, options, x, y, x + w, y, x + w, y + h, x, y + h);
checkConvertRect(fromStr, options, x, y, x + w, y, x + w, y + h, x, y + h);
@ -188,10 +188,10 @@ function checkQuadIsQuad(fromStr, options, x1, y1, x2, y2, x3, y3, x4, y4) {
isApprox(q.p4.x, x4, quadsExpr + " checking quad.p4.x", options);
isApprox(q.p4.y, y4, quadsExpr + " checking quad.p4.y", options);
isApprox(q.bounds.left, Math.min(x1,x2,x3,x4), quadsExpr + " checking quad.bounds.left", options);
isApprox(q.bounds.top, Math.min(y1,y2,y3,y4), quadsExpr + " checking quad.bounds.top", options);
isApprox(q.bounds.right, Math.max(x1,x2,x3,x4), quadsExpr + " checking quad.bounds.right", options);
isApprox(q.bounds.bottom, Math.max(y1,y2,y3,y4), quadsExpr + " checking quad.bounds.bottom", options);
isApprox(q.getBounds().left, Math.min(x1,x2,x3,x4), quadsExpr + " checking quad.getBounds().left", options);
isApprox(q.getBounds().top, Math.min(y1,y2,y3,y4), quadsExpr + " checking quad.getBounds().top", options);
isApprox(q.getBounds().right, Math.max(x1,x2,x3,x4), quadsExpr + " checking quad.getBounds().right", options);
isApprox(q.getBounds().bottom, Math.max(y1,y2,y3,y4), quadsExpr + " checking quad.getBounds().bottom", options);
checkConvertPoints(fromStr, options, x1, y1, x2, y2, x3, y3, x4, y4);
checkConvertRect(fromStr, options, x1, y1, x2, y2, x3, y3, x4, y4);
@ -454,13 +454,13 @@ function runTest() {
var ibSplitPart1X = ibSplitPart1.getBoundingClientRect().left;
var ibSplitY = ibSplit.getBoundingClientRect().top;
isEval("ibSplit.getBoxQuads().length", 3);
isEval("ibSplit.getBoxQuads()[0].bounds.left", ibSplitPart1X);
isEval("ibSplit.getBoxQuads()[0].bounds.width", 100);
isEval("ibSplit.getBoxQuads()[1].bounds.width", 110);
isEval("ibSplit.getBoxQuads()[2].bounds.width", 130);
isEval("ibSplit.getBoxQuads()[0].getBounds().left", ibSplitPart1X);
isEval("ibSplit.getBoxQuads()[0].getBounds().width", 100);
isEval("ibSplit.getBoxQuads()[1].getBounds().width", 110);
isEval("ibSplit.getBoxQuads()[2].getBounds().width", 130);
isEval("table.getBoxQuads().length", 2);
isEval("table.getBoxQuads()[0].bounds.height", 50);
isEval("table.getBoxQuads()[1].bounds.height", 40);
isEval("table.getBoxQuads()[0].getBounds().height", 50);
isEval("table.getBoxQuads()[1].getBounds().height", 40);
// Test that we skip anonymous boxes when finding the right box to be relative to.
checkQuadIsRect("d", {toStr:"ibSplit", tolerance:0.0001},
@ -475,55 +475,55 @@ function runTest() {
// Test boxes generated by block splitting. Check for borders being placed correctly.
var colSplitY = colSplit.getClientRects()[0].top;
isEval("colSplit.getBoxQuads().length", 2);
isEval("colSplit.getBoxQuads()[0].bounds.top", colSplitY);
isEval("colSplit.getBoxQuads()[0].bounds.height", 60);
isEval("colSplit.getBoxQuads()[1].bounds.top", colSplitY - 20);
isEval("colSplit.getBoxQuads()[1].bounds.height", 45);
isEval("colSplit.getBoxQuads()[0].getBounds().top", colSplitY);
isEval("colSplit.getBoxQuads()[0].getBounds().height", 60);
isEval("colSplit.getBoxQuads()[1].getBounds().top", colSplitY - 20);
isEval("colSplit.getBoxQuads()[1].getBounds().height", 45);
isEval("colSplit.getBoxQuads({box:'content'}).length", 2);
// The first box for the block has the top border; the second box has the bottom border.
isEval("colSplit.getBoxQuads({box:'content'})[0].bounds.top", colSplitY + 10);
isEval("colSplit.getBoxQuads({box:'content'})[0].bounds.height", 50);
isEval("colSplit.getBoxQuads({box:'content'})[1].bounds.top", colSplitY - 20);
isEval("colSplit.getBoxQuads({box:'content'})[1].bounds.height", 30);
isEval("colSplit.getBoxQuads({box:'content'})[0].getBounds().top", colSplitY + 10);
isEval("colSplit.getBoxQuads({box:'content'})[0].getBounds().height", 50);
isEval("colSplit.getBoxQuads({box:'content'})[1].getBounds().top", colSplitY - 20);
isEval("colSplit.getBoxQuads({box:'content'})[1].getBounds().height", 30);
var inlineSplitX = inlineSplit.getClientRects()[0].left;
isEval("inlineSplit.getBoxQuads().length", 2);
isEval("inlineSplit.getBoxQuads()[0].bounds.left", inlineSplitX);
isEval("inlineSplit.getBoxQuads()[0].bounds.width", 30);
isEval("inlineSplit.getBoxQuads()[1].bounds.left", inlineSplitX - 150);
isEval("inlineSplit.getBoxQuads()[1].bounds.width", 75);
isEval("inlineSplit.getBoxQuads()[0].getBounds().left", inlineSplitX);
isEval("inlineSplit.getBoxQuads()[0].getBounds().width", 30);
isEval("inlineSplit.getBoxQuads()[1].getBounds().left", inlineSplitX - 150);
isEval("inlineSplit.getBoxQuads()[1].getBounds().width", 75);
isEval("inlineSplit.getBoxQuads({box:'content'}).length", 2);
// The first box for the inline has the left border; the second box has the right border.
isEval("inlineSplit.getBoxQuads({box:'content'})[0].bounds.left", inlineSplitX + 10);
isEval("inlineSplit.getBoxQuads({box:'content'})[0].bounds.width", 20);
isEval("inlineSplit.getBoxQuads({box:'content'})[1].bounds.left", inlineSplitX - 150);
isEval("inlineSplit.getBoxQuads({box:'content'})[1].bounds.width", 60);
isEval("inlineSplit.getBoxQuads({box:'content'})[0].getBounds().left", inlineSplitX + 10);
isEval("inlineSplit.getBoxQuads({box:'content'})[0].getBounds().width", 20);
isEval("inlineSplit.getBoxQuads({box:'content'})[1].getBounds().left", inlineSplitX - 150);
isEval("inlineSplit.getBoxQuads({box:'content'})[1].getBounds().width", 60);
var textX = textContainer.getClientRects()[0].left;
isEval("text.getBoxQuads().length", 2);
isEval("text.getBoxQuads()[0].bounds.left", textX);
isEval("text.getBoxQuads()[1].bounds.left", textX - 150);
isEval("text.getBoxQuads()[0].getBounds().left", textX);
isEval("text.getBoxQuads()[1].getBounds().left", textX - 150);
// Box types are irrelevant for text
isEval("text.getBoxQuads({box:'content'}).length", 2);
isEval("text.getBoxQuads({box:'content'})[0].bounds.left", textX);
isEval("text.getBoxQuads({box:'content'})[1].bounds.left", textX - 150);
isEval("text.getBoxQuads({box:'content'})[0].getBounds().left", textX);
isEval("text.getBoxQuads({box:'content'})[1].getBounds().left", textX - 150);
isEval("text.getBoxQuads({box:'padding'}).length", 2);
isEval("text.getBoxQuads({box:'padding'})[0].bounds.left", textX);
isEval("text.getBoxQuads({box:'padding'})[1].bounds.left", textX - 150);
isEval("text.getBoxQuads({box:'padding'})[0].getBounds().left", textX);
isEval("text.getBoxQuads({box:'padding'})[1].getBounds().left", textX - 150);
isEval("text.getBoxQuads({box:'margin'}).length", 2);
isEval("text.getBoxQuads({box:'margin'})[0].bounds.left", textX);
isEval("text.getBoxQuads({box:'margin'})[1].bounds.left", textX - 150);
isEval("text.getBoxQuads({box:'margin'})[0].getBounds().left", textX);
isEval("text.getBoxQuads({box:'margin'})[1].getBounds().left", textX - 150);
// Test table margins
isEval("table.getBoxQuads({box:'margin'}).length", 1);
isEval("table.getBoxQuads({box:'margin'})[0].bounds.height", 106);
isEval("table.getBoxQuads({box:'margin'})[0].getBounds().height", 106);
// Check that a text node whose layout might have been optimized away gives
// correct results.
var suppressedTextContainerX = suppressedTextContainer.getBoundingClientRect().left;
isEval("suppressedText.getBoxQuads().length", 1);
isEval("suppressedText.getBoxQuads()[0].bounds.left", suppressedTextContainerX);
isEval("suppressedText.getBoxQuads()[0].bounds.width", 0);
isEval("suppressedText.getBoxQuads()[0].getBounds().left", suppressedTextContainerX);
isEval("suppressedText.getBoxQuads()[0].getBounds().width", 0);
var suppressedTextContainer2X = suppressedTextContainer2.getBoundingClientRect().left;
isEval("document.convertPointFromNode(zeroPoint,suppressedText2).x",

3
testing/web-platform/meta/css/geometry/historical.html.ini
View File

@ -2,9 +2,6 @@
[DOMMatrix scaleNonUniformSelf must be nuked]
expected: FAIL
[DOMQuad bounds must be nuked]
expected: FAIL
[DOMMatrixReadOnly scale number of required arguments]
expected: FAIL

12
testing/web-platform/tests/css/cssom-view/cssom-getBoxQuads-001.html
View File

@ -35,16 +35,16 @@
<script>
test(function() {
let bb = document.getElementById("block-block");
assert_equals(bb.getBoxQuads({box: "border"})[0].bounds.width, 20, "Block layout border box is expected width.");
assert_equals(bb.getBoxQuads({box: "margin"})[0].bounds.width, 100, "Block layout margin box is expected width.");
assert_equals(bb.getBoxQuads({box: "border"})[0].getBounds().width, 20, "Block layout border box is expected width.");
assert_equals(bb.getBoxQuads({box: "margin"})[0].getBounds().width, 100, "Block layout margin box is expected width.");
// For containers that expand items to fill block-axis space, measure the box heights also.
let fb = document.getElementById("flex-block");
assert_equals(fb.getBoxQuads({box: "border"})[0].bounds.width, 20, "Flex layout border box is expected width.");
assert_equals(fb.getBoxQuads({box: "margin"})[0].bounds.width, 100, "Flex layout margin box is expected width.");
assert_equals(fb.getBoxQuads({box: "border"})[0].getBounds().width, 20, "Flex layout border box is expected width.");
assert_equals(fb.getBoxQuads({box: "margin"})[0].getBounds().width, 100, "Flex layout margin box is expected width.");
assert_equals(fb.getBoxQuads({box: "border"})[0].bounds.height, 10, "Flex layout border box is expected height.");
assert_equals(fb.getBoxQuads({box: "margin"})[0].bounds.height, 50, "Flex layout margin box is expected height.");
assert_equals(fb.getBoxQuads({box: "border"})[0].getBounds().height, 10, "Flex layout border box is expected height.");
assert_equals(fb.getBoxQuads({box: "margin"})[0].getBounds().height, 50, "Flex layout margin box is expected height.");
});
</script>
</body>