From 2cd605532905a46d730921b9cddb62fec82906da Mon Sep 17 00:00:00 2001 From: Josh Aas Date: Tue, 22 Sep 2009 21:52:49 -0400 Subject: [PATCH] Fix dragging in Google Maps street view on Mac OS X. b=516602 r=roc --- layout/generic/nsObjectFrame.cpp | 7 +------ widget/src/cocoa/nsChildView.mm | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp index 3ee8d4463bcb..c97f0876f7f4 100644 --- a/layout/generic/nsObjectFrame.cpp +++ b/layout/generic/nsObjectFrame.cpp @@ -4232,13 +4232,8 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent) break; } } -#ifndef NP_NO_CARBON - else if ((eventModel == NPEventModelCarbon) && (static_cast(event)->what == nullEvent)) { - Point carbonPt = { 20000, 20000 }; - InitializeEventRecord(&synthCarbonEvent, &carbonPt); - event = &synthCarbonEvent; - } +#ifndef NP_NO_CARBON // Work around an issue in the Flash plugin, which can cache a pointer // to a doomed TSM document (one that belongs to a NSTSMInputContext) // and try to activate it after it has been deleted. See bug 183313. diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm index 6770bff3a9f9..c4601b7404b3 100644 --- a/widget/src/cocoa/nsChildView.mm +++ b/widget/src/cocoa/nsChildView.mm @@ -3542,7 +3542,7 @@ static nsEventStatus SendGeckoMouseEnterOrExitEvent(PRBool isTrusted, #ifndef NP_NO_CARBON EventRecord carbonEvent; if (mPluginEventModel == NPEventModelCarbon) { - carbonEvent.what = nullEvent; + carbonEvent.what = NPEventType_AdjustCursorEvent; carbonEvent.message = 0; carbonEvent.when = ::TickCount(); ::GetGlobalMouse(&carbonEvent.where);