mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 952033 - Part b: Use IntSize in CreateOffscreenSurface; r=roc

This commit is contained in:
Ms2ger 2014-02-09 09:04:38 +01:00
Родитель f70eb58dd6
Коммит 42aa546e2f
33 изменённых файлов: 101 добавлений и 71 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
content/canvas/src/CanvasRenderingContext2D.cpp
Просмотреть файл

@ -3463,7 +3463,7 @@ CanvasRenderingContext2D::DrawWindow(nsGlobalWindow& window, double x,
thebes->Scale(matrix._11, matrix._22);
} else {
drawSurf =
gfxPlatform::GetPlatform()->CreateOffscreenSurface(gfxIntSize(ceil(sw), ceil(sh)),
gfxPlatform::GetPlatform()->CreateOffscreenSurface(IntSize(ceil(sw), ceil(sh)),
gfxContentType::COLOR_ALPHA);
if (!drawSurf) {
error.Throw(NS_ERROR_FAILURE);

6
gfx/gl/GLTextureImage.cpp
Просмотреть файл

@ -209,7 +209,8 @@ already_AddRefed<gfxASurface>
BasicTextureImage::GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt)
{
return gfxPlatform::GetPlatform()->
CreateOffscreenSurface(aSize, gfxASurface::ContentFromFormat(aFmt));
CreateOffscreenSurface(aSize.ToIntSize(),
gfxASurface::ContentFromFormat(aFmt));
}
bool
@ -512,7 +513,8 @@ TiledTextureImage::BeginUpdate(nsIntRegion& aRegion)
(GetContentType() == gfxContentType::COLOR) ?
gfxImageFormat::RGB24 : gfxImageFormat::ARGB32;
mUpdateSurface = gfxPlatform::GetPlatform()->
CreateOffscreenSurface(gfxIntSize(bounds.width, bounds.height), gfxASurface::ContentFromFormat(format));
CreateOffscreenSurface(bounds.Size().ToIntSize(),
gfxASurface::ContentFromFormat(format));
mUpdateSurface->SetDeviceOffset(gfxPoint(-bounds.x, -bounds.y));
return mUpdateSurface;

8
gfx/gl/TextureImageCGL.mm
Просмотреть файл

@ -5,11 +5,15 @@
#include "TextureImageCGL.h"
#include "GLContext.h"
#include "gfx2DGlue.h"
#include "gfxQuartzSurface.h"
#include "gfxPlatform.h"
#include "gfxFailure.h"
namespace mozilla {
using namespace gfx;
namespace gl {
TextureImageCGL::TextureImageCGL(GLuint aTexture,
@ -37,7 +41,7 @@ TextureImageCGL::~TextureImageCGL()
already_AddRefed<gfxASurface>
TextureImageCGL::GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt)
{
gfxIntSize size(aSize.width + 1, aSize.height + 1);
IntSize size(aSize.width + 1, aSize.height + 1);
mGLContext->MakeCurrent();
if (!mGLContext->
IsExtensionSupported(GLContext::ARB_pixel_buffer_object))
@ -78,7 +82,7 @@ TextureImageCGL::GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt)
}
nsRefPtr<gfxQuartzSurface> surf =
new gfxQuartzSurface(data, size, size.width * 4, aFmt);
new gfxQuartzSurface(data, ThebesIntSize(size), size.width * 4, aFmt);
mBoundPixelBuffer = true;
return surf.forget();

2
gfx/layers/Layers.cpp
Просмотреть файл

@ -118,7 +118,7 @@ LayerManager::CreateOptimalSurface(const gfx::IntSize &aSize,
gfxImageFormat aFormat)
{
return gfxPlatform::GetPlatform()->
CreateOffscreenSurface(gfx::ThebesIntSize(aSize), gfxASurface::ContentFromFormat(aFormat));
CreateOffscreenSurface(aSize, gfxASurface::ContentFromFormat(aFormat));
}
already_AddRefed<gfxASurface>

3
gfx/layers/basic/TextureClientX11.cpp
Просмотреть файл

@ -121,8 +121,7 @@ TextureClientX11::AllocateForSurface(IntSize aSize, TextureAllocationFlags aText
//MOZ_ASSERT(mFormat != gfx::FORMAT_YUV, "This TextureClient cannot use YCbCr data");
gfxContentType contentType = ContentForFormat(mFormat);
gfxIntSize size = ThebesIntSize(aSize);
nsRefPtr<gfxASurface> surface = gfxPlatform::GetPlatform()->CreateOffscreenSurface(size, contentType);
nsRefPtr<gfxASurface> surface = gfxPlatform::GetPlatform()->CreateOffscreenSurface(aSize, contentType);
if (!surface || surface->GetType() != gfxSurfaceType::Xlib) {
NS_ERROR("creating Xlib surface failed!");
return false;

2
gfx/layers/ipc/ShadowLayerUtilsX11.cpp
Просмотреть файл

@ -135,7 +135,7 @@ ISurfaceAllocator::PlatformAllocSurfaceDescriptor(const gfx::IntSize& aSize,
gfxPlatform* platform = gfxPlatform::GetPlatform();
nsRefPtr<gfxASurface> buffer =
platform->CreateOffscreenSurface(gfx::ThebesIntSize(aSize), aContent);
platform->CreateOffscreenSurface(aSize, aContent);
if (!buffer ||
buffer->GetType() != gfxSurfaceType::Xlib) {
NS_ERROR("creating Xlib front/back surfaces failed!");

2
gfx/tests/gtest/gfxFontSelectionTest.cpp
Просмотреть файл

@ -188,7 +188,7 @@ MakeContext ()
nsRefPtr<gfxASurface> surface;
surface = gfxPlatform::GetPlatform()->
CreateOffscreenSurface(gfxIntSize(size, size),
CreateOffscreenSurface(IntSize(size, size),
gfxASurface::ContentFromFormat(gfxImageFormat::RGB24));
nsRefPtr<gfxContext> ctx = new gfxContext(surface);
return ctx.forget();

2
gfx/tests/gtest/gfxTextRunPerfTest.cpp
Просмотреть файл

@ -40,7 +40,7 @@ MakeContext ()
nsRefPtr<gfxASurface> surface;
surface = gfxPlatform::GetPlatform()->
CreateOffscreenSurface(gfxIntSize(size, size),
CreateOffscreenSurface(IntSize(size, size),
gfxASurface::ContentFromFormat(gfxImageFormat::RGB24));
nsRefPtr<gfxContext> ctx = new gfxContext(surface);
return ctx.forget();

2
gfx/tests/gtest/gfxWordCacheTest.cpp
Просмотреть файл

@ -81,7 +81,7 @@ MakeContext ()
nsRefPtr<gfxASurface> surface;
surface = gfxPlatform::GetPlatform()->
CreateOffscreenSurface(gfxIntSize(size, size),
CreateOffscreenSurface(IntSize(size, size),
gfxASurface::ContentFromFormat(gfxImageFormat::RGB24));
nsRefPtr<gfxContext> ctx = new gfxContext(surface);
return ctx.forget();

8
gfx/thebes/gfxAndroidPlatform.cpp
Просмотреть файл

@ -10,6 +10,7 @@
#include "mozilla/gfx/2D.h"
#include "mozilla/Preferences.h"
#include "gfx2DGlue.h"
#include "gfxFT2FontList.h"
#include "gfxImageSurface.h"
#include "mozilla/dom/ContentChild.h"
@ -135,11 +136,12 @@ gfxAndroidPlatform::~gfxAndroidPlatform()
}
already_AddRefed<gfxASurface>
gfxAndroidPlatform::CreateOffscreenSurface(const gfxIntSize& size,
gfxContentType contentType)
gfxAndroidPlatform::CreateOffscreenSurface(const IntSize& size,
gfxContentType contentType)
{
nsRefPtr<gfxASurface> newSurface;
newSurface = new gfxImageSurface(size, OptimalFormatForContent(contentType));
newSurface = new gfxImageSurface(ThebesIntSize(size),
OptimalFormatForContent(contentType));
return newSurface.forget();
}

2
gfx/thebes/gfxAndroidPlatform.h
Просмотреть файл

@ -33,7 +33,7 @@ public:
}
virtual already_AddRefed<gfxASurface>
CreateOffscreenSurface(const gfxIntSize& size,
CreateOffscreenSurface(const IntSize& size,
gfxContentType contentType);
virtual already_AddRefed<gfxASurface>
OptimizeImage(gfxImageSurface *aSurface,

3
gfx/thebes/gfxDrawable.cpp
Просмотреть файл

@ -196,7 +196,8 @@ already_AddRefed<gfxSurfaceDrawable>
gfxCallbackDrawable::MakeSurfaceDrawable(const GraphicsFilter aFilter)
{
nsRefPtr<gfxASurface> surface =
gfxPlatform::GetPlatform()->CreateOffscreenSurface(mSize, gfxContentType::COLOR_ALPHA);
gfxPlatform::GetPlatform()->CreateOffscreenSurface(mSize.ToIntSize(),
gfxContentType::COLOR_ALPHA);
if (!surface || surface->CairoStatus() != 0)
return nullptr;

13
gfx/thebes/gfxOS2Platform.cpp
Просмотреть файл

@ -49,29 +49,30 @@ gfxOS2Platform::~gfxOS2Platform()
}
already_AddRefed<gfxASurface>
gfxOS2Platform::CreateOffscreenSurface(const gfxIntSize& aSize,
gfxOS2Platform::CreateOffscreenSurface(const IntSize& aSize,
gfxContentType contentType)
{
#ifdef DEBUG_thebes_2
printf("gfxOS2Platform::CreateOffscreenSurface(%d/%d, %d)\n",
aSize.width, aSize.height, aImageFormat);
#endif
gfxASurface *newSurface = nullptr;
nsRefPtr<gfxASurface> newSurface;
// we only ever seem to get aImageFormat=0 or gfxImageFormat::ARGB32 but
// I don't really know if we need to differ between ARGB32 and RGB24 here
if (contentType == gfxContentType::COLOR_ALPHA ||
contentType == gfxContentType::COLOR)
{
newSurface = new gfxOS2Surface(aSize, OptimalFormatForContent(contentType));
newSurface = new gfxOS2Surface(ThebesIntSize(aSize),
OptimalFormatForContent(contentType));
} else if (contentType == gfxContentType::ALPHA) {
newSurface = new gfxImageSurface(aSize, OptimalFormatForContent(contentType));
newSurface = new gfxImageSurface(ThebesIntSize(aSize),
OptimalFormatForContent(contentType));
} else {
return nullptr;
}
NS_IF_ADDREF(newSurface);
return newSurface;
return newSurface.forget();
}
nsresult

6
gfx/thebes/gfxOS2Platform.h
Просмотреть файл

@ -26,9 +26,9 @@ public:
return (gfxOS2Platform*) gfxPlatform::GetPlatform();
}
already_AddRefed<gfxASurface>
CreateOffscreenSurface(const gfxIntSize& size,
gfxContentType contentType);
virtual already_AddRefed<gfxASurface>
CreateOffscreenSurface(const IntSize& size,
gfxContentType contentType) MOZ_OVERRIDE;
nsresult GetFontList(nsIAtom *aLangGroup,
const nsACString& aGenericFamily,

6
gfx/thebes/gfxPlatform.cpp
Просмотреть файл

@ -440,7 +440,7 @@ gfxPlatform::Init()
#endif
gPlatform->mScreenReferenceSurface =
gPlatform->CreateOffscreenSurface(gfxIntSize(1,1),
gPlatform->CreateOffscreenSurface(IntSize(1, 1),
gfxContentType::COLOR_ALPHA);
if (!gPlatform->mScreenReferenceSurface) {
NS_RUNTIMEABORT("Could not initialize mScreenReferenceSurface");
@ -633,7 +633,7 @@ already_AddRefed<gfxASurface>
gfxPlatform::OptimizeImage(gfxImageSurface *aSurface,
gfxImageFormat format)
{
const gfxIntSize& surfaceSize = aSurface->GetSize();
IntSize surfaceSize = aSurface->GetSize().ToIntSize();
#ifdef XP_WIN
if (gfxWindowsPlatform::GetPlatform()->GetRenderMode() ==
@ -992,7 +992,7 @@ gfxPlatform::CreateDrawTargetForBackend(BackendType aBackend, const IntSize& aSi
// CreateOffscreenSurface() and CreateDrawTargetForSurface() for all
// backends).
if (aBackend == BackendType::CAIRO) {
nsRefPtr<gfxASurface> surf = CreateOffscreenSurface(ThebesIntSize(aSize),
nsRefPtr<gfxASurface> surf = CreateOffscreenSurface(aSize,
ContentForFormat(aFormat));
if (!surf || surf->CairoStatus()) {
return nullptr;

7
gfx/thebes/gfxPlatform.h
Просмотреть файл

@ -158,6 +158,8 @@ GetBackendName(mozilla::gfx::BackendType aBackend)
class gfxPlatform {
public:
typedef mozilla::gfx::IntSize IntSize;
/**
* Return a pointer to the current active platform.
* This is a singleton; it contains mostly convenience
@ -176,8 +178,9 @@ public:
* Create an offscreen surface of the given dimensions
* and image format.
*/
virtual already_AddRefed<gfxASurface> CreateOffscreenSurface(const gfxIntSize& size,
gfxContentType contentType) = 0;
virtual already_AddRefed<gfxASurface>
CreateOffscreenSurface(const IntSize& size,
gfxContentType contentType) = 0;
/**
* Create an offscreen surface of the given dimensions and image format which

10
gfx/thebes/gfxPlatformGtk.cpp
Просмотреть файл

@ -11,6 +11,7 @@
#include "nsUnicharUtils.h"
#include "nsUnicodeProperties.h"
#include "gfx2DGlue.h"
#include "gfxFontconfigUtils.h"
#include "gfxPangoFonts.h"
#include "gfxContext.h"
@ -85,7 +86,7 @@ gfxPlatformGtk::~gfxPlatformGtk()
}
already_AddRefed<gfxASurface>
gfxPlatformGtk::CreateOffscreenSurface(const gfxIntSize& size,
gfxPlatformGtk::CreateOffscreenSurface(const IntSize& size,
gfxContentType contentType)
{
nsRefPtr<gfxASurface> newSurface;
@ -104,12 +105,13 @@ gfxPlatformGtk::CreateOffscreenSurface(const gfxIntSize& size,
imageFormat);
if (xrenderFormat) {
newSurface = gfxXlibSurface::Create(screen, xrenderFormat, size);
newSurface = gfxXlibSurface::Create(screen, xrenderFormat,
ThebesIntSize(size));
}
} else {
// We're not going to use XRender, so we don't need to
// search for a render format
newSurface = new gfxImageSurface(size, imageFormat);
newSurface = new gfxImageSurface(ThebesIntSize(size), imageFormat);
// The gfxImageSurface ctor zeroes this for us, no need to
// waste time clearing again
needsClear = false;
@ -121,7 +123,7 @@ gfxPlatformGtk::CreateOffscreenSurface(const gfxIntSize& size,
// We couldn't create a native surface for whatever reason;
// e.g., no display, no RENDER, bad size, etc.
// Fall back to image surface for the data.
newSurface = new gfxImageSurface(size, imageFormat);
newSurface = new gfxImageSurface(ThebesIntSize(size), imageFormat);
}
if (newSurface->CairoStatus()) {

5
gfx/thebes/gfxPlatformGtk.h
Просмотреть файл

@ -27,8 +27,9 @@ public:
return (gfxPlatformGtk*) gfxPlatform::GetPlatform();
}
already_AddRefed<gfxASurface> CreateOffscreenSurface(const gfxIntSize& size,
gfxContentType contentType);
virtual already_AddRefed<gfxASurface>
CreateOffscreenSurface(const IntSize& size,
gfxContentType contentType) MOZ_OVERRIDE;
mozilla::TemporaryRef<mozilla::gfx::ScaledFont>
GetScaledFontForFont(mozilla::gfx::DrawTarget* aTarget, gfxFont *aFont);

8
gfx/thebes/gfxPlatformMac.cpp
Просмотреть файл

@ -90,11 +90,12 @@ gfxPlatformMac::CreatePlatformFontList()
}
already_AddRefed<gfxASurface>
gfxPlatformMac::CreateOffscreenSurface(const gfxIntSize& size,
gfxPlatformMac::CreateOffscreenSurface(const IntSize& size,
gfxContentType contentType)
{
nsRefPtr<gfxASurface> newSurface =
new gfxQuartzSurface(size, OptimalFormatForContent(contentType));
new gfxQuartzSurface(ThebesIntSize(size),
OptimalFormatForContent(contentType));
return newSurface.forget();
}
@ -102,7 +103,8 @@ already_AddRefed<gfxASurface>
gfxPlatformMac::CreateOffscreenImageSurface(const gfxIntSize& aSize,
gfxContentType aContentType)
{
nsRefPtr<gfxASurface> surface = CreateOffscreenSurface(aSize, aContentType);
nsRefPtr<gfxASurface> surface =
CreateOffscreenSurface(aSize.ToIntSize(), aContentType);
#ifdef DEBUG
nsRefPtr<gfxImageSurface> imageSurface = surface->GetAsImageSurface();
NS_ASSERTION(imageSurface, "Surface cannot be converted to a gfxImageSurface");

6
gfx/thebes/gfxPlatformMac.h
Просмотреть файл

@ -25,8 +25,10 @@ public:
return (gfxPlatformMac*) gfxPlatform::GetPlatform();
}
already_AddRefed<gfxASurface> CreateOffscreenSurface(const gfxIntSize& size,
gfxContentType contentType);
virtual already_AddRefed<gfxASurface>
CreateOffscreenSurface(const IntSize& size,
gfxContentType contentType) MOZ_OVERRIDE;
virtual already_AddRefed<gfxASurface>
CreateOffscreenImageSurface(const gfxIntSize& aSize,
gfxContentType aContentType);

9
gfx/thebes/gfxQtPlatform.cpp
Просмотреть файл

@ -166,7 +166,7 @@ gfxQtPlatform::GetXScreen(QWidget* aWindow)
#endif
already_AddRefed<gfxASurface>
gfxQtPlatform::CreateOffscreenSurface(const gfxIntSize& size,
gfxQtPlatform::CreateOffscreenSurface(const IntSize& size,
gfxContentType contentType)
{
nsRefPtr<gfxASurface> newSurface = nullptr;
@ -175,14 +175,14 @@ gfxQtPlatform::CreateOffscreenSurface(const gfxIntSize& size,
#ifdef CAIRO_HAS_QT_SURFACE
if (mRenderMode == RENDER_QPAINTER) {
newSurface = new gfxQPainterSurface(size, imageFormat);
newSurface = new gfxQPainterSurface(ThebesIntSize(size), imageFormat);
return newSurface.forget();
}
#endif
if ((mRenderMode == RENDER_BUFFERED || mRenderMode == RENDER_DIRECT) &&
sDefaultQtPaintEngineType != QPaintEngine::X11) {
newSurface = new gfxImageSurface(size, imageFormat);
newSurface = new gfxImageSurface(ThebesIntSize(size), imageFormat);
return newSurface.forget();
}
@ -191,7 +191,8 @@ gfxQtPlatform::CreateOffscreenSurface(const gfxIntSize& size,
gfxXlibSurface::FindRenderFormat(GetXDisplay(), imageFormat);
Screen* screen = GetXScreen();
newSurface = gfxXlibSurface::Create(screen, xrenderFormat, size);
newSurface = gfxXlibSurface::Create(screen, xrenderFormat,
ThebesIntSize(size));
#endif
if (newSurface) {

5
gfx/thebes/gfxQtPlatform.h
Просмотреть файл

@ -38,8 +38,9 @@ public:
return (gfxQtPlatform*) gfxPlatform::GetPlatform();
}
already_AddRefed<gfxASurface> CreateOffscreenSurface(const gfxIntSize& size,
gfxContentType contentType);
virtual already_AddRefed<gfxASurface>
CreateOffscreenSurface(const IntSize& size,
gfxContentType contentType) MOZ_OVERRIDE;
mozilla::TemporaryRef<mozilla::gfx::ScaledFont>
GetScaledFontForFont(mozilla::gfx::DrawTarget* aTarget, gfxFont *aFont);

14
gfx/thebes/gfxWindowsPlatform.cpp
Просмотреть файл

@ -650,23 +650,26 @@ gfxWindowsPlatform::CreatePlatformFontList()
}
already_AddRefed<gfxASurface>
gfxWindowsPlatform::CreateOffscreenSurface(const gfxIntSize& size,
gfxWindowsPlatform::CreateOffscreenSurface(const IntSize& size,
gfxContentType contentType)
{
nsRefPtr<gfxASurface> surf = nullptr;
#ifdef CAIRO_HAS_WIN32_SURFACE
if (mRenderMode == RENDER_GDI)
surf = new gfxWindowsSurface(size, OptimalFormatForContent(contentType));
surf = new gfxWindowsSurface(ThebesIntSize(size),
OptimalFormatForContent(contentType));
#endif
#ifdef CAIRO_HAS_D2D_SURFACE
if (mRenderMode == RENDER_DIRECT2D)
surf = new gfxD2DSurface(size, OptimalFormatForContent(contentType));
surf = new gfxD2DSurface(ThebesIntSize(size),
OptimalFormatForContent(contentType));
#endif
if (!surf || surf->CairoStatus()) {
surf = new gfxImageSurface(size, OptimalFormatForContent(contentType));
surf = new gfxImageSurface(ThebesIntSize(size),
OptimalFormatForContent(contentType));
}
return surf.forget();
@ -684,7 +687,8 @@ gfxWindowsPlatform::CreateOffscreenImageSurface(const gfxIntSize& aSize,
}
#endif
nsRefPtr<gfxASurface> surface = CreateOffscreenSurface(aSize, aContentType);
nsRefPtr<gfxASurface> surface = CreateOffscreenSurface(aSize.ToIntSize(),
aContentType);
#ifdef DEBUG
nsRefPtr<gfxImageSurface> imageSurface = surface->GetAsImageSurface();
NS_ASSERTION(imageSurface, "Surface cannot be converted to a gfxImageSurface");

5
gfx/thebes/gfxWindowsPlatform.h
Просмотреть файл

@ -125,8 +125,9 @@ public:
virtual gfxPlatformFontList* CreatePlatformFontList();
already_AddRefed<gfxASurface> CreateOffscreenSurface(const gfxIntSize& size,
gfxContentType contentType);
virtual already_AddRefed<gfxASurface>
CreateOffscreenSurface(const IntSize& size,
gfxContentType contentType) MOZ_OVERRIDE;
virtual already_AddRefed<gfxASurface>
CreateOffscreenImageSurface(const gfxIntSize& aSize,
gfxContentType aContentType);

8
image/src/imgFrame.cpp
Просмотреть файл

@ -9,6 +9,7 @@
#include "prenv.h"
#include "gfx2DGlue.h"
#include "gfxPlatform.h"
#include "gfxUtils.h"
@ -31,6 +32,7 @@ static bool gDisableOptimize = false;
#endif
using namespace mozilla;
using namespace mozilla::gfx;
using namespace mozilla::image;
// Returns true if an image of aWidth x aHeight is allowed and legal.
@ -343,10 +345,10 @@ imgFrame::SurfaceForDrawing(bool aDoPadding,
gfxRect& aSourceRect,
gfxRect& aImageRect)
{
gfxIntSize size(int32_t(aImageRect.Width()), int32_t(aImageRect.Height()));
IntSize size(int32_t(aImageRect.Width()), int32_t(aImageRect.Height()));
if (!aDoPadding && !aDoPartialDecode) {
NS_ASSERTION(!mSinglePixel, "This should already have been handled");
return SurfaceWithFormat(new gfxSurfaceDrawable(ThebesSurface(), size), mFormat);
return SurfaceWithFormat(new gfxSurfaceDrawable(ThebesSurface(), ThebesIntSize(size)), mFormat);
}
gfxRect available = gfxRect(mDecoded.x, mDecoded.y, mDecoded.width, mDecoded.height);
@ -372,7 +374,7 @@ imgFrame::SurfaceForDrawing(bool aDoPadding,
tmpCtx.Rectangle(available);
tmpCtx.Fill();
return SurfaceWithFormat(new gfxSurfaceDrawable(surface, size), format);
return SurfaceWithFormat(new gfxSurfaceDrawable(surface, ThebesIntSize(size)), format);
}
// Not tiling, and we have a surface, so we can account for

4
layout/base/FrameLayerBuilder.cpp
Просмотреть файл

@ -2202,7 +2202,7 @@ PaintInactiveLayer(nsDisplayListBuilder* aBuilder,
nsRefPtr<gfxASurface> surf;
if (gfxUtils::sDumpPainting) {
surf = gfxPlatform::GetPlatform()->CreateOffscreenSurface(itemVisibleRect.Size(),
surf = gfxPlatform::GetPlatform()->CreateOffscreenSurface(itemVisibleRect.Size().ToIntSize(),
gfxContentType::COLOR_ALPHA);
surf->SetDeviceOffset(-itemVisibleRect.TopLeft());
context = new gfxContext(surf);
@ -3392,7 +3392,7 @@ static void DebugPaintItem(nsRenderingContext* aDest, nsDisplayItem *aItem, nsDi
bounds.ScaleInverse(aDest->AppUnitsPerDevPixel());
nsRefPtr<gfxASurface> surf =
gfxPlatform::GetPlatform()->CreateOffscreenSurface(gfxIntSize(bounds.width, bounds.height),
gfxPlatform::GetPlatform()->CreateOffscreenSurface(IntSize(bounds.width, bounds.height),
gfxContentType::COLOR_ALPHA);
surf->SetDeviceOffset(-bounds.TopLeft());
nsRefPtr<gfxContext> context = new gfxContext(surf);

2
layout/base/nsCSSRendering.cpp
Просмотреть файл

@ -4737,7 +4737,7 @@ nsImageRenderer::DrawBorderImageComponent(nsPresContext* aPresContext,
presContext->CSSPixelsToDevPixels(aSrc.width),
presContext->CSSPixelsToDevPixels(aSrc.height));
nsRefPtr<gfxASurface> srcSlice = gfxPlatform::GetPlatform()->
CreateOffscreenSurface(gfxIntSize(srcRect.width, srcRect.height),
CreateOffscreenSurface(IntSize(srcRect.width, srcRect.height),
gfxContentType::COLOR_ALPHA);
nsRefPtr<gfxContext> ctx = new gfxContext(srcSlice);

3
layout/base/nsPresShell.cpp
Просмотреть файл

@ -177,6 +177,7 @@
using namespace mozilla;
using namespace mozilla::css;
using namespace mozilla::dom;
using namespace mozilla::gfx;
using namespace mozilla::layers;
using namespace mozilla::gfx;
@ -8922,7 +8923,7 @@ DumpToPNG(nsIPresShell* shell, nsAString& name) {
nsRefPtr<gfxASurface> surface =
gfxPlatform::GetPlatform()->
CreateOffscreenSurface(gfxIntSize(width, height),
CreateOffscreenSurface(IntSize(width, height),
gfxASurface::ContentFromFormat(gfxImageFormat::ARGB32));
NS_ENSURE_TRUE(surface, NS_ERROR_OUT_OF_MEMORY);

6
layout/svg/nsSVGFilterInstance.cpp
Просмотреть файл

@ -530,7 +530,7 @@ nsSVGFilterInstance::BuildSourcePaint(SourceInfo *aSource,
nsRefPtr<gfxContext> ctx;
if (aTargetSurface) {
offscreenSurface = gfxPlatform::GetPlatform()->CreateOffscreenSurface(
neededRect.Size(), gfxContentType::COLOR_ALPHA);
neededRect.Size().ToIntSize(), gfxContentType::COLOR_ALPHA);
if (!offscreenSurface || offscreenSurface->CairoStatus()) {
return NS_ERROR_OUT_OF_MEMORY;
}
@ -617,7 +617,7 @@ nsSVGFilterInstance::BuildSourceImage(gfxASurface* aTargetSurface,
nsRefPtr<gfxContext> ctx;
if (aTargetSurface) {
offscreenSurface = gfxPlatform::GetPlatform()->CreateOffscreenSurface(
neededRect.Size(), gfxContentType::COLOR_ALPHA);
neededRect.Size().ToIntSize(), gfxContentType::COLOR_ALPHA);
if (!offscreenSurface || offscreenSurface->CairoStatus()) {
return NS_ERROR_OUT_OF_MEMORY;
}
@ -698,7 +698,7 @@ nsSVGFilterInstance::Render(gfxContext* aContext)
RefPtr<DrawTarget> dt;
if (aContext->IsCairo()) {
resultImage =
gfxPlatform::GetPlatform()->CreateOffscreenSurface(filterRect.Size(),
gfxPlatform::GetPlatform()->CreateOffscreenSurface(filterRect.Size().ToIntSize(),
gfxContentType::COLOR_ALPHA);
if (!resultImage || resultImage->CairoStatus())
return NS_ERROR_OUT_OF_MEMORY;

4
layout/svg/nsSVGPatternFrame.cpp
Просмотреть файл

@ -337,9 +337,9 @@ nsSVGPatternFrame::PaintPattern(gfxASurface** surface,
gfxRect transformedBBox = patternTransform.TransformBounds(bbox);
bool resultOverflows;
gfxIntSize surfaceSize =
IntSize surfaceSize =
nsSVGUtils::ConvertToSurfaceSize(
transformedBBox.Size(), &resultOverflows);
transformedBBox.Size(), &resultOverflows).ToIntSize();
// 0 disables rendering, < 0 is an error
if (surfaceSize.width <= 0 || surfaceSize.height <= 0)

3
widget/qt/nsWindow.cpp
Просмотреть файл

@ -300,7 +300,8 @@ UpdateOffScreenBuffers(int aDepth, QSize aSize, QWidget* aWidget = nullptr)
#endif
gBufferSurface = gfxPlatform::GetPlatform()->
CreateOffscreenSurface(gBufferMaxSize, gfxASurface::ContentFromFormat(format));
CreateOffscreenSurface(gBufferMaxSize.ToIntSize(),
gfxASurface::ContentFromFormat(format));
return true;
}

3
widget/xpwidgets/PuppetWidget.cpp
Просмотреть файл

@ -24,6 +24,7 @@
using namespace mozilla::dom;
using namespace mozilla::hal;
using namespace mozilla::gfx;
using namespace mozilla::layers;
using namespace mozilla::widget;
@ -103,7 +104,7 @@ PuppetWidget::Create(nsIWidget *aParent,
mVisible = true;
mSurface = gfxPlatform::GetPlatform()
->CreateOffscreenSurface(gfxIntSize(1, 1),
->CreateOffscreenSurface(IntSize(1, 1),
gfxASurface::ContentFromFormat(gfxImageFormat::ARGB32));
mIMEComposing = false;

3
widget/xpwidgets/nsBaseDragService.cpp
Просмотреть файл

@ -618,8 +618,7 @@ nsBaseDragService::DrawDragForImage(nsPresContext* aPresContext,
RefPtr<DrawTarget> dt =
gfxPlatform::GetPlatform()->
CreateOffscreenContentDrawTarget(IntSize(destSize.width, destSize.height),
CreateOffscreenContentDrawTarget(destSize.ToIntSize(),
SurfaceFormat::B8G8R8A8);
if (!dt)
return NS_ERROR_FAILURE;