mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
46d6f38e68
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.
68 lines
1.9 KiB
C++
68 lines
1.9 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_D3DSURFACEIMAGE_H
|
|
#define GFX_D3DSURFACEIMAGE_H
|
|
|
|
#include "mozilla/RefPtr.h"
|
|
#include "ImageContainer.h"
|
|
#include "nsAutoPtr.h"
|
|
#include "d3d9.h"
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
// Image class that wraps a IDirect3DSurface9. This class copies the image
|
|
// passed into SetData(), so that it can be accessed from other D3D devices.
|
|
// This class also manages the synchronization of the copy, to ensure the
|
|
// resource is ready to use.
|
|
class D3D9SurfaceImage : public Image {
|
|
public:
|
|
|
|
struct Data {
|
|
Data(IDirect3DSurface9* aSurface, const gfx::IntRect& aRegion)
|
|
: mSurface(aSurface), mRegion(aRegion) {}
|
|
RefPtr<IDirect3DSurface9> mSurface;
|
|
gfx::IntRect mRegion;
|
|
};
|
|
|
|
D3D9SurfaceImage();
|
|
virtual ~D3D9SurfaceImage();
|
|
|
|
// Copies the surface into a sharable texture's surface, and initializes
|
|
// the image.
|
|
HRESULT SetData(const Data& aData);
|
|
|
|
// Returns the description of the shared surface.
|
|
const D3DSURFACE_DESC& GetDesc() const;
|
|
|
|
gfx::IntSize GetSize() override;
|
|
|
|
virtual already_AddRefed<gfx::SourceSurface> GetAsSourceSurface() override;
|
|
|
|
virtual TextureClient* GetTextureClient(CompositableClient* aClient) override;
|
|
|
|
virtual bool IsValid() override;
|
|
|
|
private:
|
|
|
|
// Blocks the calling thread until the copy operation started in SetData()
|
|
// is complete, whereupon the texture is safe to use.
|
|
void EnsureSynchronized();
|
|
|
|
gfx::IntSize mSize;
|
|
RefPtr<IDirect3DTexture9> mTexture;
|
|
RefPtr<IDirect3DQuery9> mQuery;
|
|
RefPtr<TextureClient> mTextureClient;
|
|
HANDLE mShareHandle;
|
|
D3DSURFACE_DESC mDesc;
|
|
bool mValid;
|
|
};
|
|
|
|
} // namepace layers
|
|
} // namespace mozilla
|
|
|
|
#endif // GFX_D3DSURFACEIMAGE_H
|