Bug 773025 - fix 2 warnings in dom/plugins r=jst
authorDavid Zbarsky <dzbarsky@gmail.com>
Wed, 11 Jul 2012 20:55:59 -0700
changeset 99029 264e13c78feecb5f15c4b411b268330573c0bb59
parent 99028 94f6bf99a4aa9c071adfc77e873ae6a5034d51c6
child 99030 431ab4d097c9796b81462fce6295d82b655f0cd4
push id23099
push useremorley@mozilla.com
push dateThu, 12 Jul 2012 16:29:09 +0000
treeherdermozilla-central@f9499238bd4b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjst
bugs773025
milestone16.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 773025 - fix 2 warnings in dom/plugins r=jst
dom/plugins/base/nsPluginInstanceOwner.h
dom/plugins/ipc/PluginInstanceChild.cpp
--- a/dom/plugins/base/nsPluginInstanceOwner.h
+++ b/dom/plugins/base/nsPluginInstanceOwner.h
@@ -330,20 +330,17 @@ private:
   PRInt32                                   mInCGPaintLevel;
   nsRefPtr<nsIOSurface>                     mIOSurface;
   nsCARenderer                              mCARenderer;
   CGColorSpaceRef                           mColorProfile;
   static nsCOMPtr<nsITimer>                *sCATimer;
   static nsTArray<nsPluginInstanceOwner*>  *sCARefreshListeners;
   bool                                      mSentInitialTopLevelWindowEvent;
 #endif
-  // We need to know if async hide window is required since we
-  // can not check UseAsyncRendering when executing StopPlugin
-  bool                                      mAsyncHidePluginWindow;
-  
+
   // Initially, the event loop nesting level we were created on, it's updated
   // if we detect the appshell is on a lower level as long as we're not stopped.
   // We delay DoStopPlugin() until the appshell reaches this level or lower.
   PRUint32                    mLastEventloopNestingLevel;
   bool                        mContentFocused;
   bool                        mWidgetVisible;    // used on Mac to store our widget's visible state
 #ifdef XP_MACOSX
   bool                        mPluginPortChanged;
--- a/dom/plugins/ipc/PluginInstanceChild.cpp
+++ b/dom/plugins/ipc/PluginInstanceChild.cpp
@@ -228,17 +228,17 @@ PluginInstanceChild::InternalGetNPObject
 
         default:
             NS_NOTREACHED("Don't know what to do with this value type!");
     }
 
 #ifdef DEBUG
     {
         NPError currentResult;
-        PPluginScriptableObjectChild* currentActor;
+        PPluginScriptableObjectChild* currentActor = nsnull;
 
         switch (aValue) {
             case NPNVWindowNPObject:
                 CallNPN_GetValue_NPNVWindowNPObject(&currentActor,
                                                     &currentResult);
                 break;
             case NPNVPluginElementNPObject:
                 CallNPN_GetValue_NPNVPluginElementNPObject(&currentActor,