зеркало из https://github.com/mozilla/gecko-dev.git
Bug 783841 - Fix build warnings in layers r=cjones
This commit is contained in:
Родитель
6e9c14e23a
Коммит
38147cc954
|
@ -45,10 +45,12 @@ public:
|
|||
void SetBackingBuffer(gfxASurface* aBuffer,
|
||||
const nsIntRect& aRect, const nsIntPoint& aRotation)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
gfxIntSize prevSize = gfxIntSize(BufferRect().width, BufferRect().height);
|
||||
gfxIntSize newSize = aBuffer->GetSize();
|
||||
NS_ABORT_IF_FALSE(newSize == prevSize,
|
||||
"Swapped-in buffer size doesn't match old buffer's!");
|
||||
#endif
|
||||
nsRefPtr<gfxASurface> oldBuffer;
|
||||
oldBuffer = SetBuffer(aBuffer, aRect, aRotation);
|
||||
}
|
||||
|
|
|
@ -506,8 +506,6 @@ const gfx::Point AsyncPanZoomController::GetVelocityVector() {
|
|||
}
|
||||
|
||||
void AsyncPanZoomController::StartPanning(const MultiTouchInput& aEvent) {
|
||||
SingleTouchData& touch = GetFirstSingleTouch(aEvent);
|
||||
|
||||
float dx = mX.PanDistance(),
|
||||
dy = mY.PanDistance();
|
||||
|
||||
|
|
|
@ -73,7 +73,7 @@ PImageContainerParent* ImageBridgeParent::AllocPImageContainer(PRUint64* aID)
|
|||
{
|
||||
PRUint64 id = GenImageContainerID();
|
||||
*aID = id;
|
||||
return new ImageContainerParent(this, id);
|
||||
return new ImageContainerParent(id);
|
||||
}
|
||||
|
||||
bool ImageBridgeParent::DeallocPImageContainer(PImageContainerParent* toDealloc)
|
||||
|
|
|
@ -11,8 +11,8 @@
|
|||
namespace mozilla {
|
||||
namespace layers {
|
||||
|
||||
ImageContainerParent::ImageContainerParent(ImageBridgeParent* aBridge, PRUint32 aHandle)
|
||||
: mID(aHandle), mBridge(aBridge), mStop(false) {
|
||||
ImageContainerParent::ImageContainerParent(PRUint32 aHandle)
|
||||
: mID(aHandle), mStop(false) {
|
||||
MOZ_COUNT_CTOR(ImageContainerParent);
|
||||
}
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ class ImageContainerParent : public PImageContainerParent
|
|||
{
|
||||
public:
|
||||
|
||||
ImageContainerParent(ImageBridgeParent* aBridge, PRUint32 aContainerID);
|
||||
ImageContainerParent(PRUint32 aContainerID);
|
||||
~ImageContainerParent();
|
||||
|
||||
// Overriden from PImageContainerParent (see ImageContainer.ipdl)
|
||||
|
@ -126,7 +126,6 @@ protected:
|
|||
|
||||
private:
|
||||
PRUint64 mID;
|
||||
ImageBridgeParent* mBridge;
|
||||
bool mStop;
|
||||
};
|
||||
|
||||
|
|
|
@ -1056,7 +1056,7 @@ ShadowImageLayerOGL::CleanupResources()
|
|||
{
|
||||
if (mSharedHandle) {
|
||||
gl()->ReleaseSharedHandle(mShareType, mSharedHandle);
|
||||
mSharedHandle = NULL;
|
||||
mSharedHandle = 0;
|
||||
}
|
||||
|
||||
mExternalBufferTexture.Release();
|
||||
|
|
|
@ -864,7 +864,6 @@ RenderFrameParent::BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
|||
nsDisplayList shadowTree;
|
||||
ContainerLayer* container = GetRootLayer();
|
||||
if (aBuilder->IsForEventDelivery() && container) {
|
||||
nsRect bounds = aFrame->EnsureInnerView()->GetBounds();
|
||||
ViewTransform offset =
|
||||
ViewTransform(GetRootFrameOffset(aFrame, aBuilder), 1, 1);
|
||||
BuildListForLayer(container, mFrameLoader, offset,
|
||||
|
|
Загрузка…
Ссылка в новой задаче