Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 751602: Compile fixes for NPAPI drawing models. r=bas

Browse Source
This commit is contained in:
Josh Aas 2012-05-04 22:36:27 -04:00
parent 4f3ffc956b
commit 11cf7efcd1
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/plugins/base/nsNPAPIPluginInstance.h
View File

@ -69,12 +69,14 @@ class nsIOutputStream;
const NPDrawingModel kDefaultDrawingModel = NPDrawingModelSyncWin;
#elif defined(MOZ_X11)
const NPDrawingModel kDefaultDrawingModel = NPDrawingModelSyncX;
#else
#elif defined(XP_MACOSX)
#ifndef NP_NO_QUICKDRAW
const NPDrawingModel kDefaultDrawingModel = NPDrawingModelQuickDraw;
#else
const NPDrawingModel kDefaultDrawingModel = NPDrawingModelCoreGraphics;
#endif
#else
const NPDrawingModel kDefaultDrawingModel = static_cast<NPDrawingModel>(0);
#endif
class nsNPAPITimer

14
dom/plugins/ipc/PluginInstanceParent.cpp
View File

@ -421,15 +421,21 @@ PluginInstanceParent::AnswerNPN_SetValue_NPPVpluginDrawingModel(
mNotifySink = new NotificationSink(this);
container->SetCompositionNotifySink(mNotifySink);
} else if (drawingModel == NPDrawingModelSyncWin ||
#ifdef XP_MACOSX
} else if (
#if defined(XP_WIN)
drawingModel == NPDrawingModelSyncWin
#elif defined(XP_MACOSX)
#ifndef NP_NO_QUICKDRAW
drawingModel == NPDrawingModelQuickDraw ||
#endif
drawingModel == NPDrawingModelOpenGL ||
drawingModel == NPDrawingModelCoreGraphics ||
drawingModel == NPDrawingModelCoreGraphics
#elif defined(MOZ_X11)
drawingModel == NPDrawingModelSyncX
#else
false
#endif
drawingModel == NPDrawingModelSyncX) {
) {
*shmem = null_t();
ImageContainer *container = GetImageContainer();