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 492848 - Visibility notify event API for windowless plugins. r=roc

Browse Source
This commit is contained in:
Doug Turner 2009-10-26 00:00:14 -07:00
parent 120e3e893c
commit 1fc21399d6
1 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
layout/generic/nsObjectFrame.cpp
View File

@ -169,6 +169,7 @@ enum { XKeyPress = KeyPress };
#endif #endif
#ifdef MOZ_PLATFORM_HILDON #ifdef MOZ_PLATFORM_HILDON
#define MOZ_POST_VISIBILITY_EVENTS 1
#define MOZ_COMPOSITED_PLUGINS 1 #define MOZ_COMPOSITED_PLUGINS 1
#endif #endif
@ -382,6 +383,11 @@ public:
void SetPluginHost(nsIPluginHost* aHost); void SetPluginHost(nsIPluginHost* aHost);
#ifdef MOZ_PLATFORM_HILDON
/* the flash plugin(s) need to have thier visiblity poked */
PRBool UpdateVisibility(PRBool aForce = PR_FALSE);
#endif
nsEventStatus ProcessEvent(const nsGUIEvent & anEvent); nsEventStatus ProcessEvent(const nsGUIEvent & anEvent);
#ifdef XP_MACOSX #ifdef XP_MACOSX
@ -952,6 +958,10 @@ nsObjectFrame::FixupWindow(const nsSize& aSize)
NS_ENSURE_TRUE(window, /**/); NS_ENSURE_TRUE(window, /**/);
#ifdef MOZ_PLATFORM_HILDON
mInstanceOwner->UpdateVisibility(PR_TRUE);
#endif
#ifdef XP_MACOSX #ifdef XP_MACOSX
mInstanceOwner->FixUpPluginWindow(ePluginPaintDisable); mInstanceOwner->FixUpPluginWindow(ePluginPaintDisable);
#endif #endif
@ -996,6 +1006,10 @@ nsObjectFrame::CallSetWindow()
nsPluginNativeWindow *window = (nsPluginNativeWindow *)win; nsPluginNativeWindow *window = (nsPluginNativeWindow *)win;
#ifdef MOZ_PLATFORM_HILDON
mInstanceOwner->UpdateVisibility(PR_TRUE);
#endif
#ifdef XP_MACOSX #ifdef XP_MACOSX
mInstanceOwner->FixUpPluginWindow(ePluginPaintDisable); mInstanceOwner->FixUpPluginWindow(ePluginPaintDisable);
#endif #endif
@ -3455,6 +3469,10 @@ nsPluginInstanceOwner::GetEventloopNestingLevel()
nsresult nsPluginInstanceOwner::ScrollPositionWillChange(nsIScrollableView* aScrollable, nscoord aX, nscoord aY) nsresult nsPluginInstanceOwner::ScrollPositionWillChange(nsIScrollableView* aScrollable, nscoord aX, nscoord aY)
{ {
#ifdef MOZ_PLATFORM_HILDON
CancelTimer();
#endif
#if defined(XP_MACOSX) && !defined(NP_NO_CARBON) #if defined(XP_MACOSX) && !defined(NP_NO_CARBON)
if (GetEventModel() != NPEventModelCarbon) if (GetEventModel() != NPEventModelCarbon)
return NS_OK; return NS_OK;
@ -4948,6 +4966,11 @@ nsPluginInstanceOwner::Renderer::NativeDraw(QWidget * drawable,
NS_IMETHODIMP nsPluginInstanceOwner::Notify(nsITimer* timer) NS_IMETHODIMP nsPluginInstanceOwner::Notify(nsITimer* timer)
{ {
#ifdef MOZ_PLATFORM_HILDON
if (mInstance)
UpdateVisibility();
#endif
#if defined(XP_MACOSX) && !defined(NP_NO_CARBON) #if defined(XP_MACOSX) && !defined(NP_NO_CARBON)
if (GetEventModel() != NPEventModelCarbon) if (GetEventModel() != NPEventModelCarbon)
return NS_OK; return NS_OK;
@ -4998,6 +5021,20 @@ void nsPluginInstanceOwner::StartTimer(unsigned int aDelay)
mPluginTimer->InitWithCallback(this, aDelay, nsITimer::TYPE_REPEATING_SLACK); mPluginTimer->InitWithCallback(this, aDelay, nsITimer::TYPE_REPEATING_SLACK);
} }
#endif #endif
#ifdef MOZ_PLATFORM_HILDON
if (!mTimerCanceled)
return;
// start a periodic timer to provide null events to the plugin instance.
if (!mPluginTimer)
mPluginTimer = do_CreateInstance("@mozilla.org/timer;1");
if (mPluginTimer) {
mTimerCanceled = PR_FALSE;
mPluginTimer->InitWithCallback(this, aDelay, nsITimer::TYPE_ONE_SHOT);
}
#endif
} }
void nsPluginInstanceOwner::CancelTimer() void nsPluginInstanceOwner::CancelTimer()
@ -5202,6 +5239,31 @@ void nsPluginInstanceOwner::SetPluginHost(nsIPluginHost* aHost)
mPluginHost = aHost; mPluginHost = aHost;
} }
#ifdef MOZ_PLATFORM_HILDON
PRBool nsPluginInstanceOwner::UpdateVisibility(PRBool aForce)
{
if (!mPluginWindow || !mInstance || !mOwner)
return PR_FALSE;
// first, check our view for CSS visibility style
PRBool isVisible =
mOwner->GetView()->GetVisibility() == nsViewVisibility_kShow;
if (aForce || mWidgetVisible != isVisible) {
PRBool handled;
NPEvent pluginEvent;
XVisibilityEvent& visibilityEvent = pluginEvent.xvisibility;
visibilityEvent.type = VisibilityNotify;
visibilityEvent.display = 0;
visibilityEvent.state = isVisible ? VisibilityUnobscured : VisibilityFullyObscured;
mInstance->HandleEvent(&pluginEvent, &handled);
mWidgetVisible = isVisible;
return PR_TRUE;
}
return PR_FALSE;
}
#endif
// Mac specific code to fix up the port location and clipping region // Mac specific code to fix up the port location and clipping region
#ifdef XP_MACOSX #ifdef XP_MACOSX