Bug 1095754 - Miscellaneous code cleanup nits found along the way. r=me
authorJim Mathies <jmathies@mozilla.com>
Thu, 29 Jan 2015 13:41:57 -0600
changeset 253708 ac859b6a5de3cf3d1e42fbe498c7a305e38fd8e1
parent 253707 0bc5fb8363a2d87556abf66d957f57cf10e34824
child 253709 0b7e58a519df02da97bd0041763664b873ae3539
push id4610
push userjlund@mozilla.com
push dateMon, 30 Mar 2015 18:32:55 +0000
treeherdermozilla-beta@4df54044d9ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1095754
milestone38.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 1095754 - Miscellaneous code cleanup nits found along the way. r=me
dom/plugins/ipc/PluginWidgetParent.cpp
gfx/layers/ipc/CompositorChild.h
widget/nsIWidget.h
xpcom/glue/nsCRTGlue.cpp
xpcom/glue/nsHashKeys.h
--- a/dom/plugins/ipc/PluginWidgetParent.cpp
+++ b/dom/plugins/ipc/PluginWidgetParent.cpp
@@ -7,18 +7,16 @@
 #include "nsComponentManagerUtils.h"
 #include "nsWidgetsCID.h"
 #include "mozilla/DebugOnly.h"
 #include "nsDebug.h"
 #include "mozilla/unused.h"
 
 #if defined(MOZ_WIDGET_GTK)
 #include "nsPluginNativeWindowGtk.h"
-#else
-#include "nsPluginNativeWindow.h"
 #endif
 
 using namespace mozilla;
 using namespace mozilla::widget;
 
 #define PWLOG(...)
 // #define PWLOG(...) printf_stderr(__VA_ARGS__)
 
--- a/gfx/layers/ipc/CompositorChild.h
+++ b/gfx/layers/ipc/CompositorChild.h
@@ -59,21 +59,26 @@ public:
    */
   static PCompositorChild*
   Create(Transport* aTransport, ProcessId aOtherProcess);
 
   static CompositorChild* Get();
 
   static bool ChildProcessHasCompositor() { return sCompositor != nullptr; }
 
-  virtual bool RecvInvalidateAll() MOZ_OVERRIDE;
-  virtual bool RecvOverfill(const uint32_t &aOverfill) MOZ_OVERRIDE;
   void AddOverfillObserver(ClientLayerManager* aLayerManager);
 
-  virtual bool RecvDidComposite(const uint64_t& aId, const uint64_t& aTransactionId) MOZ_OVERRIDE;
+  virtual bool
+  RecvDidComposite(const uint64_t& aId, const uint64_t& aTransactionId) MOZ_OVERRIDE;
+
+  virtual bool
+  RecvInvalidateAll() MOZ_OVERRIDE;
+
+  virtual bool
+  RecvOverfill(const uint32_t &aOverfill) MOZ_OVERRIDE;
 
   virtual bool
   RecvUpdatePluginConfigurations(const nsIntPoint& aContentOffset,
                                  const nsIntRegion& aVisibleRegion,
                                  nsTArray<PluginWindowData>&& aPlugins) MOZ_OVERRIDE;
 
   /**
    * Request that the parent tell us when graphics are ready on GPU.
--- a/widget/nsIWidget.h
+++ b/widget/nsIWidget.h
@@ -1373,22 +1373,22 @@ class nsIWidget : public nsISupports {
     };
 
     /**
      * Sets the clip region of each mChild (which must actually be a child
      * of this widget) to the union of the pixel rects given in
      * mClipRegion, all relative to the top-left of the child
      * widget. Clip regions are not implemented on all platforms and only
      * need to actually work for children that are plugins.
-     * 
+     *
      * Also sets the bounds of each child to mBounds.
-     * 
+     *
      * This will invalidate areas of the children that have changed, but
      * does not need to invalidate any part of this widget.
-     * 
+     *
      * Children should be moved in the order given; the array is
      * sorted so to minimize unnecessary invalidation if children are
      * moved in that order.
      */
     virtual nsresult ConfigureChildren(const nsTArray<Configuration>& aConfigurations) = 0;
     virtual nsresult SetWindowClipRegion(const nsTArray<nsIntRect>& aRects,
                                          bool aIntersectWithExisting) = 0;
 
@@ -1624,17 +1624,17 @@ class nsIWidget : public nsISupports {
      */
     virtual void UpdateOpaqueRegion(const nsIntRegion &aOpaqueRegion) {}
 
     /**
      * Informs the widget about the region of the window that is draggable.
      */
     virtual void UpdateWindowDraggingRegion(const nsIntRegion& aRegion) {}
 
-    /** 
+    /**
      * Internal methods
      */
 
     //@{
     virtual void AddChild(nsIWidget* aChild) = 0;
     virtual void RemoveChild(nsIWidget* aChild) = 0;
     virtual void* GetNativeData(uint32_t aDataType) = 0;
     virtual void SetNativeData(uint32_t aDataType, uintptr_t aVal) = 0;
--- a/xpcom/glue/nsCRTGlue.cpp
+++ b/xpcom/glue/nsCRTGlue.cpp
@@ -324,17 +324,16 @@ copy_stderr_to_file(const char* aFile)
 #define VARARGS_ASSIGN(foo, bar)        VA_COPY(foo,bar)
 #elif defined(HAVE_VA_LIST_AS_ARRAY)
 #define VARARGS_ASSIGN(foo, bar)     foo[0] = bar[0]
 #else
 #define VARARGS_ASSIGN(foo, bar)     (foo) = (bar)
 #endif
 
 #if defined(XP_WIN)
-
 void
 vprintf_stderr(const char* aFmt, va_list aArgs)
 {
   if (sStderrCallback) {
     va_list argsCpy;
     VARARGS_ASSIGN(argsCpy, aArgs);
     sStderrCallback(aFmt, aArgs);
     va_end(argsCpy);
--- a/xpcom/glue/nsHashKeys.h
+++ b/xpcom/glue/nsHashKeys.h
@@ -48,17 +48,17 @@ HashString(const nsACString& aStr)
  * classes follows the nsTHashtable::EntryType specification
  *
  * Lightweight keytypes provided here:
  * nsStringHashKey
  * nsCStringHashKey
  * nsUint32HashKey
  * nsUint64HashKey
  * nsFloatHashKey
- * nsPtrHashkey
+ * nsPtrHashKey
  * nsClearingPtrHashKey
  * nsVoidPtrHashKey
  * nsClearingVoidPtrHashKey
  * nsISupportsHashKey
  * nsIDHashKey
  * nsDepCharHashKey
  * nsCharPtrHashKey
  * nsUnicharPtrHashKey