64-bit Mac OS X bustage fix for npapi-headers sync. b=571538 r=mstange
authorJosh Aas <joshmoz@gmail.com>
Tue, 15 Jun 2010 16:13:06 -0400
changeset 43652 50e1b2c0bbe0417814816eb2c673e0dcb9cabbef
parent 43651 ddb2e5fb1e444cf1c686f2e34e4a16b743726103
child 43653 c986e78050bfdec4690757207b7777f33559af6e
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersmstange
bugs64, 571538
milestone1.9.3a6pre
64-bit Mac OS X bustage fix for npapi-headers sync. b=571538 r=mstange
layout/generic/nsObjectFrame.cpp
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -440,17 +440,19 @@ private:
   nsCOMPtr<nsIContent>        mContent;
   nsCString                   mDocumentBase;
   char                       *mTagText;
   nsCOMPtr<nsIWidget>         mWidget;
   nsCOMPtr<nsIPluginHost>     mPluginHost;
 
 #ifdef XP_MACOSX
   NP_CGContext                              mCGPluginPortCopy;
+#ifndef NP_NO_QUICKDRAW
   NP_Port                                   mQDPluginPortCopy;
+#endif
   PRInt32                                   mInCGPaintLevel;
   nsIOSurface                              *mIOSurface;
   nsCARenderer                              mCARenderer;
   static nsCOMPtr<nsITimer>                *sCATimer;
   static nsTArray<nsPluginInstanceOwner*>  *sCARefreshListeners;
   PRBool                                    mSentInitialTopLevelWindowEvent;
 #endif
 
@@ -2474,17 +2476,19 @@ nsPluginInstanceOwner::nsPluginInstanceO
     ph->NewPluginNativeWindow(&mPluginWindow);
   else
     mPluginWindow = nsnull;
 
   mObjectFrame = nsnull;
   mTagText = nsnull;
 #ifdef XP_MACOSX
   memset(&mCGPluginPortCopy, 0, sizeof(NP_CGContext));
+#ifndef NP_NO_QUICKDRAW
   memset(&mQDPluginPortCopy, 0, sizeof(NP_Port));
+#endif
   mInCGPaintLevel = 0;
   mSentInitialTopLevelWindowEvent = PR_FALSE;
   mIOSurface = nsnull;
 #endif
   mContentFocused = PR_FALSE;
   mWidgetVisible = PR_TRUE;
   mPluginPortChanged = PR_FALSE;
   mNumCachedAttrs = 0;