Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-02 22:37:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1049957 - Fixes from reviews. - r=kamidphish

Browse Source
This commit is contained in:
Jeff Gilbert 2014-08-15 17:38:09 -07:00
parent 00cbda0f58
commit fb6a858464
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/gl/GLScreenBuffer.cpp
View File

@ -652,7 +652,7 @@ ReadBuffer::Create(GLContext* gl,
UniquePtr<ReadBuffer> ret( new ReadBuffer(gl, fb, depthRB,
stencilRB, surf) );
if (!gl->IsFramebufferComplete(fb)) {
ret = nullptr;
ret = nullptr;
}
return Move(ret);

2
gfx/gl/SharedSurface.cpp
View File

@ -269,7 +269,7 @@ SurfaceFactory::SurfaceFactory(GLContext* gl,
SurfaceFactory::~SurfaceFactory()
{
while (!mScraps.Empty()) {
UniquePtr<SharedSurface> cur = mScraps.Pop();
mScraps.Pop();
}
}

11
gfx/gl/SharedSurface.h
View File

@ -123,7 +123,7 @@ public:
~UniquePtrQueue() {
MOZ_ASSERT(Empty());
}
bool Empty() const {
return mQueue.empty();
}
@ -135,13 +135,12 @@ public:
UniquePtr<T> Pop() {
UniquePtr<T> ret;
if (mQueue.empty())
return Move(ret);
T* p = mQueue.front();
mQueue.pop();
if (!mQueue.empty()) {
ret.reset(mQueue.front());
mQueue.pop();
}
ret.reset(p);
return Move(ret);
}
};

8
gfx/gl/SurfaceStream.cpp
View File

@ -106,7 +106,7 @@ SurfaceStream::MoveTo(UniquePtr<SharedSurface>* slotFrom,
MOZ_ASSERT(!to);
to = Move(from);
from = nullptr;
MOZ_ASSERT(!from);
}
void
@ -120,7 +120,6 @@ SurfaceStream::Recycle(SurfaceFactory* factory, UniquePtr<SharedSurface>* surfSl
mSurfaces.erase(surf.get());
#endif
factory->Recycle(Move(surf));
surf = nullptr;
}
MOZ_ASSERT(!surf);
}
@ -153,7 +152,7 @@ SurfaceStream::Surrender(UniquePtr<SharedSurface>* surfSlot)
#endif
UniquePtr<SharedSurface> ret = Move(surf);
surf = nullptr;
MOZ_ASSERT(!surf);
return Move(ret);
}
@ -173,7 +172,7 @@ SurfaceStream::Absorb(UniquePtr<SharedSurface>* surfSlot)
#endif
UniquePtr<SharedSurface> ret = Move(surf);
surf = nullptr;
MOZ_ASSERT(!surf);
return Move(ret);
}
@ -186,7 +185,6 @@ SurfaceStream::Scrap(UniquePtr<SharedSurface>* surfSlot)
if (surf) {
mScraps.Push(Move(surf));
surf = nullptr;
}
MOZ_ASSERT(!surf);