wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 950677 - gfxIntSize -> IntSize in ipc/Shadow* files. r=nical

Browse Source
This commit is contained in:
Tor Arvid Lund 2013-12-20 11:46:30 -05:00
parent d44e391678
commit 69a8d8666c
8 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/layers/ipc/ShadowLayerUtilsD3D10.cpp
View File

@ -8,6 +8,7 @@
#include <d3d10_1.h>
#include <dxgi.h>
#include "mozilla/gfx/Point.h"
#include "mozilla/layers/LayerManagerComposite.h"
#include "mozilla/layers/PLayerTransaction.h"
#include "ShadowLayers.h"
@ -20,7 +21,7 @@ namespace layers {
// Platform-specific shadow-layers interfaces. See ShadowLayers.h.
// D3D10 doesn't need all these yet.
bool
ISurfaceAllocator::PlatformAllocSurfaceDescriptor(const gfxIntSize&,
ISurfaceAllocator::PlatformAllocSurfaceDescriptor(const gfx::IntSize&,
gfxContentType,
uint32_t,
SurfaceDescriptor*)
@ -55,7 +56,7 @@ ShadowLayerForwarder::PlatformGetDescriptorSurfaceContentType(
ShadowLayerForwarder::PlatformGetDescriptorSurfaceSize(
const SurfaceDescriptor&,
OpenMode,
gfxIntSize*,
gfx::IntSize*,
gfxASurface**)
{
return false;

9
gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
View File

@ -7,6 +7,7 @@
#include "mozilla/DebugOnly.h"
#include "mozilla/gfx/Point.h"
#include "mozilla/layers/PGrallocBufferChild.h"
#include "mozilla/layers/PGrallocBufferParent.h"
#include "mozilla/layers/LayerTransactionChild.h"
@ -239,7 +240,7 @@ GrallocBufferActor::~GrallocBufferActor()
}
/*static*/ PGrallocBufferParent*
GrallocBufferActor::Create(const gfxIntSize& aSize,
GrallocBufferActor::Create(const gfx::IntSize& aSize,
const uint32_t& aFormat,
const uint32_t& aUsage,
MaybeMagicGrallocBufferHandle* aOutHandle)
@ -355,7 +356,7 @@ ShadowLayerForwarder::AllocGrallocBuffer(const gfx::IntSize& aSize,
}
bool
ISurfaceAllocator::PlatformAllocSurfaceDescriptor(const gfxIntSize& aSize,
ISurfaceAllocator::PlatformAllocSurfaceDescriptor(const gfx::IntSize& aSize,
gfxContentType aContent,
uint32_t aCaps,
SurfaceDescriptor* aBuffer)
@ -479,7 +480,7 @@ ShadowLayerForwarder::PlatformOpenDescriptor(OpenMode aMode,
// If we fail to lock, we'll just end up aborting anyway.
MOZ_ASSERT(status == OK);
gfxIntSize size = aSurface.get_SurfaceDescriptorGralloc().size();
gfx::IntSize size = aSurface.get_SurfaceDescriptorGralloc().size();
gfxImageFormat format = ImageFormatForPixelFormat(buffer->getPixelFormat());
long pixelStride = buffer->getStride();
long byteStride = pixelStride * gfxASurface::BytePerPixelFromFormat(format);
@ -508,7 +509,7 @@ ShadowLayerForwarder::PlatformGetDescriptorSurfaceContentType(
/*static*/ bool
ShadowLayerForwarder::PlatformGetDescriptorSurfaceSize(
const SurfaceDescriptor& aDescriptor, OpenMode aMode,
gfxIntSize* aSize,
gfx::IntSize* aSize,
gfxASurface** aSurface)
{
if (SurfaceDescriptor::TSurfaceDescriptorGralloc != aDescriptor.type()) {

4
gfx/layers/ipc/ShadowLayerUtilsGralloc.h
View File

@ -70,7 +70,9 @@ public:
virtual ~GrallocBufferActor();
static PGrallocBufferParent*
Create(const gfxIntSize& aSize, const uint32_t& aFormat, const uint32_t& aUsage,
Create(const gfx::IntSize& aSize,
const uint32_t& aFormat,
const uint32_t& aUsage,
MaybeMagicGrallocBufferHandle* aOutHandle);
static PGrallocBufferChild*

2
gfx/layers/ipc/ShadowLayerUtilsMac.cpp
View File

@ -70,7 +70,7 @@ ShadowLayerForwarder::PlatformGetDescriptorSurfaceContentType(
/*static*/ bool
ShadowLayerForwarder::PlatformGetDescriptorSurfaceSize(
const SurfaceDescriptor& aDescriptor, OpenMode aMode,
gfxIntSize* aSize,
gfx::IntSize* aSize,
gfxASurface** aSurface)
{
return false;

8
gfx/layers/ipc/ShadowLayerUtilsX11.cpp
View File

@ -15,9 +15,9 @@
#include "GLDefs.h" // for GLenum
#include "gfxASurface.h" // for gfxASurface, etc
#include "gfxPlatform.h" // for gfxPlatform
#include "gfxPoint.h" // for gfxIntSize
#include "gfxXlibSurface.h" // for gfxXlibSurface
#include "mozilla/X11Util.h" // for DefaultXDisplay, FinishX, etc
#include "mozilla/gfx/Point.h" // for IntSize
#include "mozilla/layers/CompositableForwarder.h"
#include "mozilla/layers/CompositorTypes.h" // for OpenMode
#include "mozilla/layers/ISurfaceAllocator.h" // for ISurfaceAllocator, etc
@ -86,7 +86,7 @@ SurfaceDescriptorX11::SurfaceDescriptorX11(gfxXlibSurface* aSurf)
}
SurfaceDescriptorX11::SurfaceDescriptorX11(Drawable aDrawable, XID aFormatID,
const gfxIntSize& aSize)
const gfx::IntSize& aSize)
: mId(aDrawable)
, mFormat(aFormatID)
, mSize(aSize)
@ -115,7 +115,7 @@ SurfaceDescriptorX11::OpenForeign() const
}
bool
ISurfaceAllocator::PlatformAllocSurfaceDescriptor(const gfxIntSize& aSize,
ISurfaceAllocator::PlatformAllocSurfaceDescriptor(const gfx::IntSize& aSize,
gfxContentType aContent,
uint32_t aCaps,
SurfaceDescriptor* aBuffer)
@ -177,7 +177,7 @@ ShadowLayerForwarder::PlatformGetDescriptorSurfaceContentType(
/*static*/ bool
ShadowLayerForwarder::PlatformGetDescriptorSurfaceSize(
const SurfaceDescriptor& aDescriptor, OpenMode aMode,
gfxIntSize* aSize,
gfx::IntSize* aSize,
gfxASurface** aSurface)
{
return false;

5
gfx/layers/ipc/ShadowLayerUtilsX11.h
View File

@ -11,7 +11,6 @@
#include <X11/X.h> // for Drawable
#include "ipc/IPCMessageUtils.h"
#include "mozilla/GfxMessageUtils.h"
#include "gfxPoint.h" // for gfxIntSize
#include "nsCOMPtr.h" // for already_AddRefed
#define MOZ_HAVE_SURFACEDESCRIPTORX11
@ -33,7 +32,7 @@ struct SurfaceDescriptorX11 {
SurfaceDescriptorX11(gfxXlibSurface* aSurf);
SurfaceDescriptorX11(Drawable aDrawable, XID aFormatID,
const gfxIntSize& aSize);
const gfx::IntSize& aSize);
// Default copy ctor and operator= are OK
@ -50,7 +49,7 @@ struct SurfaceDescriptorX11 {
Drawable mId;
XID mFormat; // either a PictFormat or VisualID
gfxIntSize mSize;
gfx::IntSize mSize;
};
} // namespace layers

7
gfx/layers/ipc/ShadowLayers.cpp
View File

@ -20,6 +20,7 @@
#include "gfxSharedImageSurface.h" // for gfxSharedImageSurface
#include "ipc/IPCMessageUtils.h" // for gfxContentType, null_t
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
#include "mozilla/gfx/Point.h" // for IntSize
#include "mozilla/layers/CompositableClient.h" // for CompositableClient, etc
#include "mozilla/layers/LayersMessages.h" // for Edit, etc
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor, etc
@ -656,12 +657,12 @@ ShadowLayerForwarder::GetDescriptorSurfaceContentType(
return content;
}
/*static*/ gfxIntSize
/*static*/ gfx::IntSize
ShadowLayerForwarder::GetDescriptorSurfaceSize(
const SurfaceDescriptor& aDescriptor, OpenMode aMode,
gfxASurface** aSurface)
{
gfxIntSize size;
gfx::IntSize size;
if (PlatformGetDescriptorSurfaceSize(aDescriptor, aMode, &size, aSurface)) {
return size;
}
@ -744,7 +745,7 @@ ShadowLayerForwarder::PlatformGetDescriptorSurfaceContentType(
ShadowLayerForwarder::PlatformGetDescriptorSurfaceSize(
const SurfaceDescriptor&,
OpenMode,
gfxIntSize*,
gfx::IntSize*,
gfxASurface**)
{
return false;

5
gfx/layers/ipc/ShadowLayers.h
View File

@ -11,7 +11,6 @@
#include <stddef.h> // for size_t
#include <stdint.h> // for uint64_t
#include "gfxTypes.h"
#include "gfxPoint.h" // for gfxIntSize
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE
#include "mozilla/WidgetUtils.h" // for ScreenRotation
#include "mozilla/dom/ScreenOrientation.h" // for ScreenOrientation
@ -441,14 +440,14 @@ private:
gfxContentType* aContent,
gfxASurface** aSurface);
// (Same as above, but for surface size.)
static gfxIntSize
static gfx::IntSize
GetDescriptorSurfaceSize(const SurfaceDescriptor& aDescriptor,
OpenMode aMode,
gfxASurface** aSurface);
static bool
PlatformGetDescriptorSurfaceSize(const SurfaceDescriptor& aDescriptor,
OpenMode aMode,
gfxIntSize* aSize,
gfx::IntSize* aSize,
gfxASurface** aSurface);
// And again, for the image format.
// This function will return gfxImageFormatUnknown only if |aDescriptor|