mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-07 12:15:51 +00:00
974d8120f2
This conversion was done with the script:
find . -name '*.cpp' -o -name '*.h' -o -name '*.mm' -o -name '*.idl' | \
egrep -v 'cairo-win32-refptr.h|RefPtr.h|TestRefPtr.cpp' | \
xargs sed -i -e 's/mozilla::TemporaryRef</already_AddRefed</g' \
-e 's/TemporaryRef</already_AddRefed</g'
Manual fixups were performed in the following instances:
- We handled mfbt/RefPtr.h manually so as to not convert TemporaryRef itself
into already_AddRefed.
- The following files had explicit Move() calls added to make up for the lack
of a copy constructor on already_AddRefed:
dom/base/ImageEncoder.cpp
dom/media/MediaTaskQueue.{h,cpp}
dom/media/webaudio/PannerNode.cpp
- A redundant overload for MediaTaskQueue::Dispatch was deleted.
- A few manual fixups were required in mfbt/tests/TestRefPtr.cpp.
- Comments, using declarations, and forward declarations relating to
TemporaryRef in dom/canvas/ and gfx/layers/ were changed to refer to
already_AddRefed.
85 lines
2.0 KiB
C++
85 lines
2.0 KiB
C++
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef GFX_GLIMAGES_H
|
|
#define GFX_GLIMAGES_H
|
|
|
|
#include "GLContextTypes.h"
|
|
#include "GLTypes.h"
|
|
#include "ImageContainer.h" // for Image
|
|
#include "ImageTypes.h" // for ImageFormat::SHARED_GLTEXTURE
|
|
#include "nsCOMPtr.h" // for already_AddRefed
|
|
#include "mozilla/gfx/Point.h" // for IntSize
|
|
|
|
namespace mozilla {
|
|
namespace gl {
|
|
class AndroidSurfaceTexture;
|
|
}
|
|
namespace layers {
|
|
|
|
class GLImage : public Image {
|
|
public:
|
|
explicit GLImage(ImageFormat aFormat) : Image(nullptr, aFormat){}
|
|
|
|
virtual already_AddRefed<gfx::SourceSurface> GetAsSourceSurface() override;
|
|
};
|
|
|
|
class EGLImageImage : public GLImage {
|
|
public:
|
|
struct Data {
|
|
EGLImage mImage;
|
|
EGLSync mSync;
|
|
gfx::IntSize mSize;
|
|
gl::OriginPos mOriginPos;
|
|
bool mOwns;
|
|
|
|
Data() : mImage(nullptr), mSync(nullptr), mSize(0, 0),
|
|
mOriginPos(gl::OriginPos::TopLeft), mOwns(false)
|
|
{
|
|
}
|
|
};
|
|
|
|
void SetData(const Data& aData) { mData = aData; }
|
|
const Data* GetData() { return &mData; }
|
|
|
|
gfx::IntSize GetSize() { return mData.mSize; }
|
|
|
|
EGLImageImage() : GLImage(ImageFormat::EGLIMAGE) {}
|
|
|
|
protected:
|
|
virtual ~EGLImageImage();
|
|
|
|
private:
|
|
Data mData;
|
|
};
|
|
|
|
#ifdef MOZ_WIDGET_ANDROID
|
|
|
|
class SurfaceTextureImage : public GLImage {
|
|
public:
|
|
struct Data {
|
|
mozilla::gl::AndroidSurfaceTexture* mSurfTex;
|
|
gfx::IntSize mSize;
|
|
gl::OriginPos mOriginPos;
|
|
};
|
|
|
|
void SetData(const Data& aData) { mData = aData; }
|
|
const Data* GetData() { return &mData; }
|
|
|
|
gfx::IntSize GetSize() { return mData.mSize; }
|
|
|
|
SurfaceTextureImage() : GLImage(ImageFormat::SURFACE_TEXTURE) {}
|
|
|
|
private:
|
|
Data mData;
|
|
};
|
|
|
|
#endif // MOZ_WIDGET_ANDROID
|
|
|
|
} // layers
|
|
} // mozilla
|
|
|
|
#endif // GFX_GLIMAGES_H
|