mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-29 15:52:07 +00:00
01583602a9
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout. The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.
CLOSED TREE makes big refactorings like this a piece of cake.
# The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
xargs perl -p -i -e '
s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
s/nsRefPtr ?</RefPtr</g; # handle declarations and variables
'
# Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h
# Handle nsRefPtr.h itself, a couple places that define constructors
# from nsRefPtr, and code generators specially. We do this here, rather
# than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
# things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
mfbt/nsRefPtr.h \
xpcom/glue/nsCOMPtr.h \
xpcom/base/OwningNonNull.h \
ipc/ipdl/ipdl/lower.py \
ipc/ipdl/ipdl/builtin.py \
dom/bindings/Codegen.py \
python/lldbutils/lldbutils/utils.py
# In our indiscriminate substitution above, we renamed
# nsRefPtrGetterAddRefs, the class behind getter_AddRefs. Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'
if [ -d .git ]; then
git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi
--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
91 lines
2.3 KiB
C++
91 lines
2.3 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 MOZILLA_GFX_SOURCESURFACED2D_H_
|
|
#define MOZILLA_GFX_SOURCESURFACED2D_H_
|
|
|
|
#include "2D.h"
|
|
#include "HelpersD2D.h"
|
|
#include <vector>
|
|
|
|
namespace mozilla {
|
|
namespace gfx {
|
|
|
|
class DataSourceSurfaceD2D;
|
|
|
|
class SourceSurfaceD2D : public SourceSurface
|
|
{
|
|
public:
|
|
MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(SourceSurfaceD2D)
|
|
SourceSurfaceD2D();
|
|
~SourceSurfaceD2D();
|
|
|
|
virtual SurfaceType GetType() const { return SurfaceType::D2D1_BITMAP; }
|
|
virtual IntSize GetSize() const;
|
|
virtual SurfaceFormat GetFormat() const;
|
|
virtual bool IsValid() const;
|
|
|
|
virtual already_AddRefed<DataSourceSurface> GetDataSurface();
|
|
|
|
ID2D1Bitmap *GetBitmap() { return mBitmap; }
|
|
|
|
bool InitFromData(unsigned char *aData,
|
|
const IntSize &aSize,
|
|
int32_t aStride,
|
|
SurfaceFormat aFormat,
|
|
ID2D1RenderTarget *aRT);
|
|
bool InitFromTexture(ID3D10Texture2D *aTexture,
|
|
SurfaceFormat aFormat,
|
|
ID2D1RenderTarget *aRT);
|
|
private:
|
|
friend class DrawTargetD2D;
|
|
friend class DataSourceSurfaceD2D;
|
|
|
|
uint32_t GetByteSize() const;
|
|
|
|
RefPtr<ID2D1Bitmap> mBitmap;
|
|
// We need to keep this pointer here to check surface validity.
|
|
RefPtr<ID3D10Device> mDevice;
|
|
SurfaceFormat mFormat;
|
|
IntSize mSize;
|
|
};
|
|
|
|
|
|
class DataSourceSurfaceD2D : public DataSourceSurface
|
|
{
|
|
public:
|
|
MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DataSourceSurfaceD2D)
|
|
DataSourceSurfaceD2D(SourceSurfaceD2D* aSourceSurface);
|
|
virtual ~DataSourceSurfaceD2D();
|
|
|
|
virtual unsigned char* GetData();
|
|
virtual int32_t Stride();
|
|
virtual IntSize GetSize() const;
|
|
virtual SurfaceFormat GetFormat() const;
|
|
virtual bool Map(MapType, MappedSurface *aMappedSurface);
|
|
virtual void Unmap();
|
|
|
|
bool IsValid()
|
|
{
|
|
return mTexture;
|
|
}
|
|
|
|
private:
|
|
void EnsureMappedTexture();
|
|
|
|
RefPtr<ID3D10Texture2D> mTexture;
|
|
|
|
D3D10_MAPPED_TEXTURE2D mData;
|
|
|
|
SurfaceFormat mFormat;
|
|
IntSize mSize;
|
|
bool mMapped;
|
|
};
|
|
|
|
}
|
|
}
|
|
|
|
#endif /* MOZILLA_GFX_SOURCESURFACED2D_H_ */
|