зеркало из https://github.com/mozilla/gecko-dev.git
Simple removal of a couple of scope levels in Mac OS X object frame event handling code. No bug. r=roc
This commit is contained in:
Родитель
cc2978a0dd
Коммит
5967cfb1cf
|
@ -4426,13 +4426,17 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
|
||||||
return nsEventStatus_eIgnore;
|
return nsEventStatus_eIgnore;
|
||||||
|
|
||||||
#ifdef XP_MACOSX
|
#ifdef XP_MACOSX
|
||||||
if (mWidget) {
|
if (!mWidget)
|
||||||
|
return nsEventStatus_eIgnore;
|
||||||
|
|
||||||
// we never care about synthesized mouse enter
|
// we never care about synthesized mouse enter
|
||||||
if (anEvent.message == NS_MOUSE_ENTER_SYNTH)
|
if (anEvent.message == NS_MOUSE_ENTER_SYNTH)
|
||||||
return nsEventStatus_eIgnore;
|
return nsEventStatus_eIgnore;
|
||||||
|
|
||||||
nsCOMPtr<nsIPluginWidget> pluginWidget = do_QueryInterface(mWidget);
|
nsCOMPtr<nsIPluginWidget> pluginWidget = do_QueryInterface(mWidget);
|
||||||
if (pluginWidget && NS_SUCCEEDED(pluginWidget->StartDrawPlugin())) {
|
if (!pluginWidget || NS_FAILED(pluginWidget->StartDrawPlugin()))
|
||||||
|
return nsEventStatus_eIgnore;
|
||||||
|
|
||||||
NPEventModel eventModel = GetEventModel();
|
NPEventModel eventModel = GetEventModel();
|
||||||
|
|
||||||
// If we have to synthesize an event we'll use one of these.
|
// If we have to synthesize an event we'll use one of these.
|
||||||
|
@ -4574,8 +4578,6 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
|
||||||
rv = nsEventStatus_eConsumeNoDefault;
|
rv = nsEventStatus_eConsumeNoDefault;
|
||||||
|
|
||||||
pluginWidget->EndDrawPlugin();
|
pluginWidget->EndDrawPlugin();
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XP_WIN
|
#ifdef XP_WIN
|
||||||
|
|
Загрузка…
Ссылка в новой задаче