nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1843477, avoid rooting hazards from AddRef, r=peterv

Browse source 
Depends on D188960

Differential Revision: https://phabricator.services.mozilla.com/D189208
This commit is contained in:
Olli Pettay 2023-09-26 12:36:22 +00:00
parent 21eaac8d85
commit f1cb7e564b
1 changed files with 20 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

26
dom/base/DOMMatrix.cpp
View file

@ -204,8 +204,11 @@ already_AddRefed<DOMMatrixReadOnly> DOMMatrixReadOnly::FromFloat32Array(
[&](const Span<float>& aData, JS::AutoCheckCannotGC&& nogc) {
const int length = aData.Length();
const bool is2D = length == 6;
RefPtr<DOMMatrixReadOnly> obj =
new DOMMatrixReadOnly(global.forget(), is2D);
RefPtr<DOMMatrixReadOnly> obj;
{
JS::AutoSuppressGCAnalysis suppress;
obj = new DOMMatrixReadOnly(global.forget(), is2D);
}
SetDataInMatrix(obj, aData.Elements(), length, aRv);
nogc.reset(); // Done with aData
return obj.forget();
@ -220,8 +223,11 @@ already_AddRefed<DOMMatrixReadOnly> DOMMatrixReadOnly::FromFloat64Array(
[&](const Span<double>& aData, JS::AutoCheckCannotGC&& nogc) {
const int length = aData.Length();
const bool is2D = length == 6;
RefPtr<DOMMatrixReadOnly> obj =
new DOMMatrixReadOnly(global.forget(), is2D);
RefPtr<DOMMatrixReadOnly> obj;
{
JS::AutoSuppressGCAnalysis suppress;
obj = new DOMMatrixReadOnly(global.forget(), is2D);
}
SetDataInMatrix(obj, aData.Elements(), length, aRv);
nogc.reset(); // Done with aData
return obj.forget();
@ -651,7 +657,11 @@ already_AddRefed<DOMMatrix> DOMMatrix::FromFloat32Array(
[&](const Span<float>& aData, JS::AutoCheckCannotGC&& nogc) {
const int length = aData.Length();
const bool is2D = length == 6;
RefPtr<DOMMatrix> obj = new DOMMatrix(global.forget(), is2D);
RefPtr<DOMMatrix> obj;
{
JS::AutoSuppressGCAnalysis suppress;
obj = new DOMMatrix(global.forget(), is2D);
}
SetDataInMatrix(obj, aData.Elements(), length, aRv);
nogc.reset(); // Done with aData
return obj.forget();
@ -666,7 +676,11 @@ already_AddRefed<DOMMatrix> DOMMatrix::FromFloat64Array(
[&](const Span<double>& aData, JS::AutoCheckCannotGC&& nogc) {
const int length = aData.Length();
const bool is2D = length == 6;
RefPtr<DOMMatrix> obj = new DOMMatrix(global.forget(), is2D);
RefPtr<DOMMatrix> obj;
{
JS::AutoSuppressGCAnalysis suppress;
obj = new DOMMatrix(global.forget(), is2D);
}
SetDataInMatrix(obj, aData.Elements(), length, aRv);
nogc.reset(); // Done with aData
return obj.forget();