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 for Texture* classes. r=nical

Browse Source
This commit is contained in:
Tor Arvid Lund 2013-12-20 11:46:30 -05:00
parent 7ca62e387f
commit 9730e53aed
4 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/layers/SharedTextureImage.h
View File

@ -9,7 +9,6 @@
#include "GLContextProvider.h" // for GLContextProvider
#include "ImageContainer.h" // for Image
#include "ImageTypes.h" // for ImageFormat::SHARED_TEXTURE
#include "gfxPoint.h" // for gfxIntSize
#include "nsCOMPtr.h" // for already_AddRefed
#include "mozilla/gfx/Point.h" // for IntSize

8
gfx/layers/d3d11/TextureD3D11.cpp
View File

@ -313,7 +313,7 @@ DeprecatedTextureHostShmemD3D11::UpdateImpl(const SurfaceDescriptor& aImage,
nsRefPtr<gfxImageSurface> surf = openSurf.GetAsImage();
gfxIntSize size = surf->GetSize();
gfx::IntSize size = gfx::ToIntSize(surf->GetSize());
uint32_t bpp = 0;
@ -338,7 +338,7 @@ DeprecatedTextureHostShmemD3D11::UpdateImpl(const SurfaceDescriptor& aImage,
NS_ERROR("Bad image format");
}
mSize = IntSize(size.width, size.height);
mSize = size;
CD3D11_TEXTURE2D_DESC desc(dxgiFormat, size.width, size.height,
1, 1, D3D11_BIND_SHADER_RESOURCE,
@ -488,9 +488,9 @@ DeprecatedTextureHostYCbCrD3D11::UpdateImpl(const SurfaceDescriptor& aImage,
YCbCrImageDataDeserializer yuvDeserializer(aImage.get_YCbCrImage().data().get<uint8_t>());
gfxIntSize gfxCbCrSize = yuvDeserializer.GetCbCrSize();
gfx::IntSize gfxCbCrSize = gfx::ToIntSize(yuvDeserializer.GetCbCrSize());
gfxIntSize size = yuvDeserializer.GetYSize();
gfx::IntSize size = gfx::ToIntSize(yuvDeserializer.GetYSize());
D3D11_SUBRESOURCE_DATA initData;
initData.pSysMem = yuvDeserializer.GetYData();

2
gfx/layers/d3d9/TextureD3D9.cpp
View File

@ -803,7 +803,7 @@ DeprecatedTextureClientDIB::EnsureAllocated(gfx::IntSize aSize,
gfxContentType aType)
{
if (mSurface) {
gfxIntSize size = mSurface->GetSize();
gfx::IntSize size = gfx::ToIntSize(mSurface->GetSize());
if (size.width == aSize.width &&
size.height == aSize.height) {
return true;

29
gfx/layers/opengl/TextureHostOGL.cpp
View File

@ -16,7 +16,6 @@
#include "TiledLayerBuffer.h" // for TILEDLAYERBUFFER_TILE_SIZE
#include "gfx2DGlue.h" // for ContentForFormat, etc
#include "gfxImageSurface.h" // for gfxImageSurface
#include "gfxPoint.h" // for gfxIntSize
#include "gfxReusableSurfaceWrapper.h" // for gfxReusableSurfaceWrapper
#include "ipc/AutoOpenSurface.h" // for AutoOpenSurface
#include "mozilla/gfx/2D.h" // for DataSourceSurface
@ -882,8 +881,8 @@ YCbCrDeprecatedTextureHostOGL::UpdateImpl(const SurfaceDescriptor& aImage,
YCbCrImageDataDeserializer deserializer(aImage.get_YCbCrImage().data().get<uint8_t>());
gfxIntSize gfxSize = deserializer.GetYSize();
gfxIntSize gfxCbCrSize = deserializer.GetCbCrSize();
gfx::IntSize gfxSize = gfx::ToIntSize(deserializer.GetYSize());
gfx::IntSize gfxCbCrSize = gfx::ToIntSize(deserializer.GetCbCrSize());
if (!mYTexture->mTexImage || mYTexture->mTexImage->GetSize() != gfxSize) {
mYTexture->mTexImage = CreateBasicTextureImage(mGL,
@ -907,15 +906,21 @@ YCbCrDeprecatedTextureHostOGL::UpdateImpl(const SurfaceDescriptor& aImage,
FlagsToGLFlags(mFlags));
}
RefPtr<gfxImageSurface> tempY = new gfxImageSurface(deserializer.GetYData(),
gfxSize, deserializer.GetYStride(),
gfxImageFormatA8);
RefPtr<gfxImageSurface> tempCb = new gfxImageSurface(deserializer.GetCbData(),
gfxCbCrSize, deserializer.GetCbCrStride(),
gfxImageFormatA8);
RefPtr<gfxImageSurface> tempCr = new gfxImageSurface(deserializer.GetCrData(),
gfxCbCrSize, deserializer.GetCbCrStride(),
gfxImageFormatA8);
RefPtr<gfxImageSurface> tempY =
new gfxImageSurface(deserializer.GetYData(),
gfx::ThebesIntSize(gfxSize),
deserializer.GetYStride(),
gfxImageFormatA8);
RefPtr<gfxImageSurface> tempCb =
new gfxImageSurface(deserializer.GetCbData(),
gfx::ThebesIntSize(gfxCbCrSize),
deserializer.GetCbCrStride(),
gfxImageFormatA8);
RefPtr<gfxImageSurface> tempCr =
new gfxImageSurface(deserializer.GetCrData(),
gfx::ThebesIntSize(gfxCbCrSize),
deserializer.GetCbCrStride(),
gfxImageFormatA8);
nsIntRegion yRegion(nsIntRect(0, 0, gfxSize.width, gfxSize.height));
nsIntRegion cbCrRegion(nsIntRect(0, 0, gfxCbCrSize.width, gfxCbCrSize.height));