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

Null pointer check if no default plugin. part of patch for bug 54437 a=av sr=buster

Browse Source
This commit is contained in:
peterlubczynski%netscape.com 2001-01-10 23:51:07 +00:00
parent 0402acedf2
commit 8d852ff6bc
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
layout/generic/nsObjectFrame.cpp
View File

@ -2487,8 +2487,11 @@ nsPluginInstanceOwner::HandleEvent(nsIDOMEvent* aEvent)
nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent) nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
{ {
nsEventStatus rv = nsEventStatus_eIgnore; nsEventStatus rv = nsEventStatus_eIgnore;
if (!mInstance) // if mInstance is null, we shouldn't be here
return rv;
#ifdef XP_MAC #ifdef XP_MAC
if (mInstance != NULL) { if (mWidget != NULL) { // check for null mWidget
EventRecord* event = (EventRecord*)anEvent.nativeMsg; EventRecord* event = (EventRecord*)anEvent.nativeMsg;
if (event == NULL || event->what == nullEvent) { if (event == NULL || event->what == nullEvent) {
EventRecord macEvent; EventRecord macEvent;

5
layout/html/base/src/nsObjectFrame.cpp
View File

@ -2487,8 +2487,11 @@ nsPluginInstanceOwner::HandleEvent(nsIDOMEvent* aEvent)
nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent) nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
{ {
nsEventStatus rv = nsEventStatus_eIgnore; nsEventStatus rv = nsEventStatus_eIgnore;
if (!mInstance) // if mInstance is null, we shouldn't be here
return rv;
#ifdef XP_MAC #ifdef XP_MAC
if (mInstance != NULL) { if (mWidget != NULL) { // check for null mWidget
EventRecord* event = (EventRecord*)anEvent.nativeMsg; EventRecord* event = (EventRecord*)anEvent.nativeMsg;
if (event == NULL || event->what == nullEvent) { if (event == NULL || event->what == nullEvent) {
EventRecord macEvent; EventRecord macEvent;