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 740200 - Azure support in nsWindow; r=mattwoodrow

Browse Source
This commit is contained in:
Anthony Jones 2013-09-19 16:29:51 +12:00
parent 991b6d7e94
commit 079d6d523d
2 changed files with 63 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
widget/gtk2/nsWindow.cpp
View File

@ -2112,12 +2112,31 @@ nsWindow::OnExposeEvent(cairo_t *cr)
return TRUE; return TRUE;
} }
gfxASurface* surf;
#if defined(MOZ_WIDGET_GTK2) #if defined(MOZ_WIDGET_GTK2)
nsRefPtr<gfxContext> ctx = new gfxContext(GetThebesSurface()); surf = GetThebesSurface();
#else #else
nsRefPtr<gfxContext> ctx = new gfxContext(GetThebesSurface(cr)); surf = GetThebesSurface(cr);
#endif #endif
nsRefPtr<gfxContext> ctx;
if (gfxPlatform::GetPlatform()->
SupportsAzureContentForType(BACKEND_CAIRO)) {
IntSize intSize(surf->GetSize().width, surf->GetSize().height);
ctx = new gfxContext(gfxPlatform::GetPlatform()->
CreateDrawTargetForSurface(surf, intSize));
} else if (gfxPlatform::GetPlatform()->
SupportsAzureContentForType(BACKEND_SKIA) &&
surf->GetType() != gfxASurface::SurfaceTypeImage) {
gfxImageSurface* imgSurf = static_cast<gfxImageSurface*>(surf);
SurfaceFormat format = ImageFormatToSurfaceFormat(imgSurf->Format());
IntSize intSize(surf->GetSize().width, surf->GetSize().height);
ctx = new gfxContext(gfxPlatform::GetPlatform()->CreateDrawTargetForData(
imgSurf->Data(), intSize, imgSurf->Stride(), format));
} else {
ctx = new gfxContext(surf);
}
#ifdef MOZ_X11 #ifdef MOZ_X11
nsIntRect boundsRect; // for shaped only nsIntRect boundsRect; // for shaped only
@ -2181,23 +2200,7 @@ nsWindow::OnExposeEvent(cairo_t *cr)
if (painted) { if (painted) {
nsRefPtr<gfxPattern> pattern = ctx->PopGroup(); nsRefPtr<gfxPattern> pattern = ctx->PopGroup();
nsRefPtr<gfxImageSurface> img = UpdateAlpha(pattern, boundsRect);
new gfxImageSurface(gfxIntSize(boundsRect.width, boundsRect.height),
gfxImageSurface::ImageFormatA8);
if (img && !img->CairoStatus()) {
img->SetDeviceOffset(gfxPoint(-boundsRect.x, -boundsRect.y));
nsRefPtr<gfxContext> imgCtx = new gfxContext(img);
if (imgCtx) {
imgCtx->SetPattern(pattern);
imgCtx->SetOperator(gfxContext::OPERATOR_SOURCE);
imgCtx->Paint();
}
UpdateTranslucentWindowAlphaInternal(nsIntRect(boundsRect.x, boundsRect.y,
boundsRect.width, boundsRect.height),
img->Data(), img->Stride());
}
ctx->SetOperator(gfxContext::OPERATOR_SOURCE); ctx->SetOperator(gfxContext::OPERATOR_SOURCE);
ctx->SetPattern(pattern); ctx->SetPattern(pattern);
@ -2245,6 +2248,44 @@ nsWindow::OnExposeEvent(cairo_t *cr)
return TRUE; return TRUE;
} }
void
nsWindow::UpdateAlpha(gfxPattern* aPattern, nsIntRect aBoundsRect)
{
if (gfxPlatform::GetPlatform()->SupportsAzureContent()) {
// We need to create our own buffer to force the stride to match the
// expected stride.
int32_t stride = GetAlignedStride<4>(BytesPerPixel(FORMAT_A8) *
aBoundsRect.width);
int32_t bufferSize = stride * aBoundsRect.height;
nsAutoArrayPtr<PRUint8> imageBuffer(new (std::nothrow) PRUint8[bufferSize]);
RefPtr<DrawTarget> drawTarget = gfxPlatform::GetPlatform()->
CreateDrawTargetForData(imageBuffer, ToIntSize(aBoundsRect.Size()),
stride, FORMAT_A8);
if (drawTarget) {
drawTarget->FillRect(ToRect(aBoundsRect),
*aPattern->GetPattern(drawTarget),
DrawOptions(1.0, OP_SOURCE));
}
UpdateTranslucentWindowAlphaInternal(aBoundsRect, imageBuffer, stride);
} else {
nsRefPtr<gfxImageSurface> img =
new gfxImageSurface(ThebesIntSize(aBoundsRect.Size()),
gfxImageSurface::ImageFormatA8);
if (img && !img->CairoStatus()) {
img->SetDeviceOffset(-aBoundsRect.TopLeft());
nsRefPtr<gfxContext> imgCtx = new gfxContext(img);
imgCtx->SetPattern(aPattern);
imgCtx->SetOperator(gfxContext::OPERATOR_SOURCE);
imgCtx->Paint();
UpdateTranslucentWindowAlphaInternal(aBoundsRect, img->Data(),
img->Stride());
}
}
}
gboolean gboolean
nsWindow::OnConfigureEvent(GtkWidget *aWidget, GdkEventConfigure *aEvent) nsWindow::OnConfigureEvent(GtkWidget *aWidget, GdkEventConfigure *aEvent)
{ {

3
widget/gtk2/nsWindow.h
View File

@ -64,6 +64,7 @@ extern PRLogModuleInfo *gWidgetDrawLog;
#endif /* MOZ_LOGGING */ #endif /* MOZ_LOGGING */
class gfxPattern;
class nsDragService; class nsDragService;
#if defined(MOZ_X11) && defined(MOZ_HAVE_SHAREDMEMORYSYSV) #if defined(MOZ_X11) && defined(MOZ_HAVE_SHAREDMEMORYSYSV)
# define MOZ_HAVE_SHMIMAGE # define MOZ_HAVE_SHMIMAGE
@ -201,6 +202,8 @@ public:
#endif #endif
private: private:
void UpdateAlpha(gfxPattern* aPattern, nsIntRect aBoundsRect);
void NativeResize(int32_t aWidth, void NativeResize(int32_t aWidth,
int32_t aHeight, int32_t aHeight,
bool aRepaint); bool aRepaint);