Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 877115 - some compilation fixes - no review, trivial build fix

Browse Source
This commit is contained in:
Benoit Jacob 2014-01-01 14:47:19 -05:00
parent 5cfa83a3e4
commit bd21578d7f
8 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/canvas/src/WebGLContext.cpp
View File

@ -397,7 +397,7 @@ WebGLContext::SetDimensions(int32_t width, int32_t height)
PresentScreenBuffer();
// ResizeOffscreen scraps the current prod buffer before making a new one.
gl->ResizeOffscreen(gfxIntSize(width, height)); // Doesn't matter if it succeeds (soft-fail)
gl->ResizeOffscreen(gfx::IntSize(width, height)); // Doesn't matter if it succeeds (soft-fail)
// It's unlikely that we'll get a proper-sized context if we recreate if we didn't on resize
// everything's good, we're done here

2
gfx/gl/GLContext.cpp
View File

@ -1497,7 +1497,7 @@ GLContext::PublishFrame()
{
MOZ_ASSERT(mScreen);
if (!mScreen->PublishFrame(ThebesIntSize(OffscreenSize())))
if (!mScreen->PublishFrame(OffscreenSize()))
return false;
return true;

4
gfx/gl/GLContextProviderCGL.mm
View File

@ -197,7 +197,7 @@ public:
bool
GLContextCGL::ResizeOffscreen(const gfx::IntSize& aNewSize)
{
return ResizeScreenBuffer(ThebesIntSize(aNewSize));
return ResizeScreenBuffer(aNewSize);
}
static GLContextCGL *
@ -271,7 +271,7 @@ GLContextProviderCGL::CreateOffscreen(const gfxIntSize& size,
nsRefPtr<GLContextCGL> glContext = CreateOffscreenFBOContext();
if (glContext &&
glContext->Init() &&
glContext->InitOffscreen(size, caps))
glContext->InitOffscreen(ToIntSize(size), caps))
{
return glContext.forget();
}

4
gfx/gl/GLContextProviderEGL.cpp
View File

@ -615,7 +615,7 @@ protected:
bool
GLContextEGL::ResizeOffscreen(const gfx::IntSize& aNewSize)
{
return ResizeScreenBuffer(ThebesIntSize(aNewSize));
return ResizeScreenBuffer(aNewSize);
}
static const EGLint kEGLConfigAttribsOffscreenPBuffer[] = {
@ -883,7 +883,7 @@ GLContextProviderEGL::CreateOffscreen(const gfxIntSize& size,
if (!glContext)
return nullptr;
if (!glContext->InitOffscreen(size, caps))
if (!glContext->InitOffscreen(ToIntSize(size), caps))
return nullptr;
return glContext.forget();

3
gfx/gl/GLContextProviderGLX.cpp
View File

@ -30,6 +30,7 @@
#include "gfxPlatform.h"
#include "GLContext.h"
#include "gfxUtils.h"
#include "gfx2DGlue.h"
#include "gfxCrashReporterUtils.h"
@ -1232,7 +1233,7 @@ GLContextProviderGLX::CreateOffscreen(const gfxIntSize& size,
if (!glContext)
return nullptr;
if (!glContext->InitOffscreen(size, caps))
if (!glContext->InitOffscreen(ToIntSize(size), caps))
return nullptr;
return glContext.forget();

4
gfx/gl/GLContextProviderWGL.cpp
View File

@ -445,7 +445,7 @@ IsValidSizeForFormat(HDC hDC, int format,
bool
GLContextWGL::ResizeOffscreen(const gfx::IntSize& aNewSize)
{
return ResizeScreenBuffer(ThebesIntSize(aNewSize));
return ResizeScreenBuffer(aNewSize);
}
static GLContextWGL *
@ -696,7 +696,7 @@ GLContextProviderWGL::CreateOffscreen(const gfxIntSize& size,
return nullptr;
}
if (!glContext->InitOffscreen(size, caps))
if (!glContext->InitOffscreen(ToIntSize(size), caps))
return nullptr;
return glContext.forget();

2
gfx/gl/SharedSurfaceGralloc.cpp
View File

@ -77,7 +77,7 @@ SharedSurface_Gralloc::Create(GLContext* prodGL,
gfxContentType type = hasAlpha ? GFX_CONTENT_COLOR_ALPHA
: GFX_CONTENT_COLOR;
if (!allocator->AllocSurfaceDescriptorWithCaps(ThebesIntSize(size), type, USING_GL_RENDERING_ONLY, &baseDesc))
if (!allocator->AllocSurfaceDescriptorWithCaps(size, type, USING_GL_RENDERING_ONLY, &baseDesc))
return false;
if (baseDesc.type() != SurfaceDescriptor::TSurfaceDescriptorGralloc) {

2
gfx/gl/TextureImageCGL.mm
View File

@ -114,7 +114,7 @@ CreateTextureImageCGL(GLContext* gl,
TextureImage::Flags aFlags,
TextureImage::ImageFormat aImageFormat)
{
if (!gl->IsOffscreenSizeAllowed(gfxIntSize(aSize.width, aSize.height)) &&
if (!gl->IsOffscreenSizeAllowed(aSize) &&
gfxPlatform::OffMainThreadCompositingEnabled()) {
NS_ASSERTION(aWrapMode == LOCAL_GL_CLAMP_TO_EDGE, "Can't support wrapping with tiles!");
nsRefPtr<TextureImage> t = new gl::TiledTextureImage(gl, aSize, aContentType,