Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-01 17:23:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 657874 Fix Flash movie playback with w_mode on a screen with xBGR visual r=karlt

Browse Source
This commit is contained in:
Ginn Chen 2011-06-02 10:27:51 +08:00
parent 34ac31d691
commit cb199eeb47
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dom/plugins/ipc/PluginInstanceChild.cpp
View File

@ -281,7 +281,7 @@ PluginInstanceChild::NPN_GetValue(NPNVariable aVar,
switch(aVar) { switch(aVar) {
case NPNVSupportsWindowless: case NPNVSupportsWindowless:
#if defined(OS_LINUX) || defined(OS_WIN) #if defined(OS_LINUX) || defined(MOZ_X11) || defined(OS_WIN)
*((NPBool*)aValue) = true; *((NPBool*)aValue) = true;
#else #else
*((NPBool*)aValue) = false; *((NPBool*)aValue) = false;
@ -300,7 +300,7 @@ PluginInstanceChild::NPN_GetValue(NPNVariable aVar,
return NPERR_NO_ERROR; return NPERR_NO_ERROR;
} }
#endif #endif
#if defined(OS_LINUX) #if defined(MOZ_X11)
case NPNVSupportsXEmbedBool: case NPNVSupportsXEmbedBool:
*((NPBool*)aValue) = true; *((NPBool*)aValue) = true;
return NPERR_NO_ERROR; return NPERR_NO_ERROR;
@ -2351,7 +2351,16 @@ PluginInstanceChild::CreateOptSurface(void)
} }
if (mSurfaceType == gfxASurface::SurfaceTypeXlib) { if (mSurfaceType == gfxASurface::SurfaceTypeXlib) {
XRenderPictFormat* xfmt = gfxXlibSurface::FindRenderFormat(dpy, format); if (!mIsTransparent || mBackground) {
Visual* defaultVisual = DefaultVisualOfScreen(screen);
mCurrentSurface =
gfxXlibSurface::Create(screen, defaultVisual,
gfxIntSize(mWindow.width,
mWindow.height));
return mCurrentSurface != nsnull;
}
XRenderPictFormat* xfmt = XRenderFindStandardFormat(dpy, PictStandardARGB32);
if (!xfmt) { if (!xfmt) {
NS_ERROR("Need X falback surface, but FindRenderFormat failed"); NS_ERROR("Need X falback surface, but FindRenderFormat failed");
return false; return false;
@ -2725,7 +2734,7 @@ PluginInstanceChild::PaintRectToSurface(const nsIntRect& aRect,
// provided it is within the clipRect.), see bug 574583 // provided it is within the clipRect.), see bug 574583
plPaintRect.SetRect(0, 0, aRect.XMost(), aRect.YMost()); plPaintRect.SetRect(0, 0, aRect.XMost(), aRect.YMost());
} }
if (renderSurface->GetType() != gfxASurface::SurfaceTypeXlib) { if (mHelperSurface) {
// On X11 we can paint to non Xlib surface only with HelperSurface // On X11 we can paint to non Xlib surface only with HelperSurface
#if (MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6) #if (MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6)
// Don't use mHelperSurface if surface is image and mMaemoImageRendering is TRUE // Don't use mHelperSurface if surface is image and mMaemoImageRendering is TRUE
@ -2934,7 +2943,8 @@ PluginInstanceChild::ShowPluginFrame()
PLUGIN_LOG_DEBUG((" (on background)")); PLUGIN_LOG_DEBUG((" (on background)"));
// Source the background pixels ... // Source the background pixels ...
{ {
nsRefPtr<gfxContext> ctx = new gfxContext(mCurrentSurface); nsRefPtr<gfxContext> ctx =
new gfxContext(mHelperSurface ? mHelperSurface : mCurrentSurface);
ctx->SetSource(mBackground); ctx->SetSource(mBackground);
ctx->SetOperator(gfxContext::OPERATOR_SOURCE); ctx->SetOperator(gfxContext::OPERATOR_SOURCE);
ctx->Rectangle(gfxRect(rect.x, rect.y, rect.width, rect.height)); ctx->Rectangle(gfxRect(rect.x, rect.y, rect.width, rect.height));
@ -3331,13 +3341,7 @@ PluginInstanceChild::SwapSurfaces()
if (mCurrentSurface && mBackSurface && if (mCurrentSurface && mBackSurface &&
(mCurrentSurface->GetSize() != mBackSurface->GetSize() || (mCurrentSurface->GetSize() != mBackSurface->GetSize() ||
mCurrentSurface->GetContentType() != mBackSurface->GetContentType())) { mCurrentSurface->GetContentType() != mBackSurface->GetContentType())) {
mCurrentSurface = nsnull; ClearCurrentSurface();
#ifdef XP_WIN
if (mCurrentSurfaceActor) {
PPluginSurfaceChild::Send__delete__(mCurrentSurfaceActor);
mCurrentSurfaceActor = NULL;
}
#endif
} }
} }