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

Bug 1274589 - Rename RegionBuilder::Or to RegionBuilder::OrWith for consistency with the region classes. r=jrmuizel

Browse Source 
MozReview-Commit-ID: CIzTVKXUVSs
This commit is contained in:
Kartikaya Gupta 2016-05-21 00:06:51 -04:00
parent 3255b2aed3
commit 9994166655
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/ipc/GfxMessageUtils.h
View File

@ -387,7 +387,7 @@ struct RegionParamTraits
*result = builder.ToRegion();
return true;
}
builder.Or(rect);
builder.OrWith(rect);
}
return false;

2
gfx/src/RegionBuilder.h
View File

@ -16,7 +16,7 @@ public:
RegionBuilder()
{}
void Or(const RectType& aRect) {
void OrWith(const RectType& aRect) {
pixman_box32_t box = { aRect.x, aRect.y, aRect.XMost(), aRect.YMost() };
mRects.AppendElement(box);
}

4
gfx/tests/gtest/TestRegion.cpp
View File

@ -719,13 +719,13 @@ void BenchRegionBuilderOr() {
RegionBuilder<nsRegion> r;
for (int i = 0; i < size; i++) {
r.Or(nsRect(i, i, i + 10, i + 10));
r.OrWith(nsRect(i, i, i + 10, i + 10));
}
r.ToRegion();
RegionBuilder<nsIntRegion> rInt;
for (int i = 0; i < size; i++) {
rInt.Or(nsIntRect(i, i, i + 10, i + 10));
rInt.OrWith(nsIntRect(i, i, i + 10, i + 10));
}
rInt.ToRegion();
}

2
layout/base/nsLayoutUtils.cpp
View File

@ -9068,7 +9068,7 @@ nsLayoutUtils::TransformToAncestorAndCombineRegions(
for (nsRegion::RectIterator it = aRegion.RectIter(); !it.Done(); it.Next()) {
nsRect transformed = TransformFrameRectToAncestor(
aFrame, it.Get(), aAncestorFrame, &isPrecise, aMatrixCache);
transformedRegion.Or(transformed);
transformedRegion.OrWith(transformed);
}
nsRegion* dest = isPrecise ? aPreciseTargetDest : aImpreciseTargetDest;
dest->OrWith(transformedRegion.ToRegion());