wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1239864 (part 3) - Use the new rect iterators in docshell/ and dom/. r=baku.

Browse Source
This commit is contained in:
Nicholas Nethercote 2016-01-18 17:20:44 -08:00
parent 930b809f01
commit 4cf55819dc
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docshell/base/timeline/LayerTimelineMarker.h
View File

@ -23,13 +23,13 @@ public:
void AddLayerRectangles(dom::Sequence<dom::ProfileTimelineLayerRect>& aRectangles) void AddLayerRectangles(dom::Sequence<dom::ProfileTimelineLayerRect>& aRectangles)
{ {
nsIntRegionRectIterator it(mRegion); for (auto iter = mRegion.RectIter(); !iter.Done(); iter.Next()) {
while (const nsIntRect* iterRect = it.Next()) { const nsIntRect& iterRect = iter.Get();
dom::ProfileTimelineLayerRect rect; dom::ProfileTimelineLayerRect rect;
rect.mX = iterRect->X(); rect.mX = iterRect.X();
rect.mY = iterRect->Y(); rect.mY = iterRect.Y();
rect.mWidth = iterRect->Width(); rect.mWidth = iterRect.Width();
rect.mHeight = iterRect->Height(); rect.mHeight = iterRect.Height();
aRectangles.AppendElement(rect, fallible); aRectangles.AppendElement(rect, fallible);
} }
} }

6
dom/events/NotifyPaintEvent.cpp
View File

@ -84,11 +84,9 @@ NotifyPaintEvent::ClientRects()
RefPtr<DOMRectList> rectList = new DOMRectList(parent); RefPtr<DOMRectList> rectList = new DOMRectList(parent);
nsRegion r = GetRegion(); nsRegion r = GetRegion();
nsRegionRectIterator iter(r); for (auto iter = r.RectIter(); !iter.Done(); iter.Next()) {
for (const nsRect* rgnRect = iter.Next(); rgnRect; rgnRect = iter.Next()) {
RefPtr<DOMRect> rect = new DOMRect(parent); RefPtr<DOMRect> rect = new DOMRect(parent);
rect->SetLayoutRect(iter.Get());
rect->SetLayoutRect(*rgnRect);
rectList->Append(rect); rectList->Append(rect);
} }

7
dom/plugins/ipc/PluginInstanceChild.cpp
View File

@ -3871,10 +3871,9 @@ PluginInstanceChild::ReadbackDifferenceRect(const nsIntRect& rect)
// Subtract from mSurfaceDifferenceRect area which is overlapping with rect // Subtract from mSurfaceDifferenceRect area which is overlapping with rect
nsIntRegion result; nsIntRegion result;
result.Sub(mSurfaceDifferenceRect, nsIntRegion(rect)); result.Sub(mSurfaceDifferenceRect, nsIntRegion(rect));
nsIntRegionRectIterator iter(result); for (auto iter = result.RectIter(); !iter.Done(); iter.Next()) {
const nsIntRect* r; const nsIntRect& r = iter.Get();
while ((r = iter.Next()) != nullptr) { dt->CopySurface(source, r, r.TopLeft());
dt->CopySurface(source, *r, r->TopLeft());
} }
return true; return true;