mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Minor Mac OS X plugin related cleanup, no bug. r=smichaud

This commit is contained in:
Josh Aas 2009-06-19 12:15:23 -04:00
Родитель 5b7f3d1857
Коммит cf01ab4fd7
4 изменённых файлов: 23 добавлений и 34 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
layout/generic/nsObjectFrame.cpp
Просмотреть файл

@ -2961,8 +2961,6 @@ nsresult nsPluginInstanceOwner::EnsureCachedAttrParamArrays()
nsCOMPtr<nsIDOMNodeList> allParams;
nsINodeInfo *ni = mContent->NodeInfo();
// Making DOM method calls can cause our frame to go away, which
// might kill us...
nsCOMPtr<nsIPluginInstanceOwner> kungFuDeathGrip(this);
@ -4941,7 +4939,7 @@ WindowRef nsPluginInstanceOwner::FixUpPluginWindow(PRInt32 inPaintState)
nsIntPoint pluginOrigin;
nsIntRect widgetClip;
PRBool widgetVisible;
pluginWidget->GetPluginClipRect(widgetClip, pluginOrigin, /* out */ widgetVisible);
pluginWidget->GetPluginClipRect(widgetClip, pluginOrigin, widgetVisible);
// printf("GetPluginClipRect returning visible %d\n", widgetVisible);

3
modules/plugin/base/public/npapi.h
Просмотреть файл

@ -68,9 +68,10 @@
#endif /* __MWERKS__ */
#ifdef XP_MACOSX
#include <Carbon/Carbon.h>
#ifdef __LP64__
#define NP_NO_QUICKDRAW
#else
#include <Carbon/Carbon.h>
#endif
#endif

10
modules/plugin/base/public/nsIPluginInstance.idl
Просмотреть файл

@ -35,16 +35,6 @@
*
* ***** END LICENSE BLOCK ***** */
/**
* nsIPluginInstance
*
* @status DEPRECATED
*
* Originally published XPCOM Plugin API is now deprecated
* Developers are welcome to use NPAPI, please refer to:
* http://mozilla.org/projects/plugins/
*/
#include "nsISupports.idl"
#include "nsIPluginStreamListener.idl"

34
widget/src/cocoa/nsChildView.mm
Просмотреть файл

@ -4087,20 +4087,20 @@ static PRBool ConvertUnicodeToCharCode(PRUnichar inUniChar, unsigned char* outCh
}
static void ConvertCocoaKeyEventToMacEvent(NSEvent* cocoaEvent, EventRecord& macEvent, PRUint32 keyType = 0)
static void ConvertCocoaKeyEventToCarbonEvent(NSEvent* cocoaEvent, EventRecord& pluginEvent, PRUint32 keyType = 0)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
UInt32 charCode = 0;
if ([cocoaEvent type] == NSFlagsChanged) {
macEvent.what = keyType == NS_KEY_DOWN ? keyDown : keyUp;
pluginEvent.what = keyType == NS_KEY_DOWN ? keyDown : keyUp;
} else {
if ([[cocoaEvent characters] length] > 0)
charCode = [[cocoaEvent characters] characterAtIndex:0];
if ([cocoaEvent type] == NSKeyDown)
macEvent.what = [cocoaEvent isARepeat] ? autoKey : keyDown;
pluginEvent.what = [cocoaEvent isARepeat] ? autoKey : keyDown;
else
macEvent.what = keyUp;
pluginEvent.what = keyUp;
}
if (charCode >= 0x0080) {
@ -4125,10 +4125,10 @@ static void ConvertCocoaKeyEventToMacEvent(NSEvent* cocoaEvent, EventRecord& mac
break;
}
}
macEvent.message = (charCode & 0x00FF) | (nsCocoaUtils::GetCocoaEventKeyCode(cocoaEvent) << 8);
macEvent.when = ::TickCount();
::GetGlobalMouse(&macEvent.where);
macEvent.modifiers = ::GetCurrentEventKeyModifiers();
pluginEvent.message = (charCode & 0x00FF) | (nsCocoaUtils::GetCocoaEventKeyCode(cocoaEvent) << 8);
pluginEvent.when = ::TickCount();
::GetGlobalMouse(&pluginEvent.where);
pluginEvent.modifiers = ::GetCurrentEventKeyModifiers();
NS_OBJC_END_TRY_ABORT_BLOCK;
}
@ -5050,7 +5050,7 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
// might send the keyDown event with wrong keyboard layout if other
// keyboard layouts are already loaded. In that case, the native event
// doesn't match to this gecko event...
ConvertCocoaKeyEventToMacEvent(mCurKeyEvent, macEvent);
ConvertCocoaKeyEventToCarbonEvent(mCurKeyEvent, macEvent);
geckoEvent.nativeMsg = &macEvent;
geckoEvent.isShift = (nsCocoaUtils::GetCocoaEventModifierFlags(mCurKeyEvent) & NSShiftKeyMask) != 0;
if (!IsPrintableChar(geckoEvent.charCode)) {
@ -5467,7 +5467,7 @@ static const char* ToEscapedString(NSString* aString, nsCAutoString& aBuf)
// create native EventRecord for use by plugins
EventRecord macEvent;
ConvertCocoaKeyEventToMacEvent(theEvent, macEvent);
ConvertCocoaKeyEventToCarbonEvent(theEvent, macEvent);
geckoEvent.nativeMsg = &macEvent;
mKeyDownHandled = mGeckoChild->DispatchWindowEvent(geckoEvent);
@ -5513,7 +5513,7 @@ static const char* ToEscapedString(NSString* aString, nsCAutoString& aBuf)
// create native EventRecord for use by plugins
EventRecord macEvent;
ConvertCocoaKeyEventToMacEvent(theEvent, macEvent);
ConvertCocoaKeyEventToCarbonEvent(theEvent, macEvent);
geckoEvent.nativeMsg = &macEvent;
mKeyPressHandled = mGeckoChild->DispatchWindowEvent(geckoEvent);
@ -5550,7 +5550,7 @@ static const char* ToEscapedString(NSString* aString, nsCAutoString& aBuf)
// create native EventRecord for use by plugins
EventRecord macEvent;
ConvertCocoaKeyEventToMacEvent(theEvent, macEvent);
ConvertCocoaKeyEventToCarbonEvent(theEvent, macEvent);
geckoEvent.nativeMsg = &macEvent;
mKeyPressHandled = mGeckoChild->DispatchWindowEvent(geckoEvent);
@ -5704,7 +5704,7 @@ static BOOL keyUpAlreadySentKeyDown = NO;
nsKeyEvent keyUpEvent(PR_TRUE, NS_KEY_UP, nsnull);
[self convertCocoaKeyEvent:theEvent toGeckoEvent:&keyUpEvent];
EventRecord macKeyUpEvent;
ConvertCocoaKeyEventToMacEvent(theEvent, macKeyUpEvent);
ConvertCocoaKeyEventToCarbonEvent(theEvent, macKeyUpEvent);
keyUpEvent.nativeMsg = &macKeyUpEvent;
mGeckoChild->DispatchWindowEvent(keyUpEvent);
return;
@ -5730,7 +5730,7 @@ static BOOL keyUpAlreadySentKeyDown = NO;
// create native EventRecord for use by plugins
EventRecord macEvent;
ConvertCocoaKeyEventToMacEvent(nativeKeyDownEvent, macEvent);
ConvertCocoaKeyEventToCarbonEvent(nativeKeyDownEvent, macEvent);
geckoEvent.nativeMsg = &macEvent;
keyDownHandled = mGeckoChild->DispatchWindowEvent(geckoEvent);
@ -5758,7 +5758,7 @@ static BOOL keyUpAlreadySentKeyDown = NO;
// create native EventRecord for use by plugins
EventRecord macEvent;
ConvertCocoaKeyEventToMacEvent(nativeKeyDownEvent, macEvent);
ConvertCocoaKeyEventToCarbonEvent(nativeKeyDownEvent, macEvent);
geckoEvent.nativeMsg = &macEvent;
mGeckoChild->DispatchWindowEvent(geckoEvent);
@ -5771,7 +5771,7 @@ static BOOL keyUpAlreadySentKeyDown = NO;
// create native EventRecord for use by plugins
EventRecord macEvent;
ConvertCocoaKeyEventToMacEvent(theEvent, macEvent);
ConvertCocoaKeyEventToCarbonEvent(theEvent, macEvent);
geckoEvent.nativeMsg = &macEvent;
mGeckoChild->DispatchWindowEvent(geckoEvent);
@ -5955,7 +5955,7 @@ static BOOL keyUpAlreadySentKeyDown = NO;
// create native EventRecord for use by plugins
EventRecord macEvent;
ConvertCocoaKeyEventToMacEvent(theEvent, macEvent, message);
ConvertCocoaKeyEventToCarbonEvent(theEvent, macEvent, message);
geckoEvent.nativeMsg = &macEvent;
mGeckoChild->DispatchWindowEvent(geckoEvent);