Bug 825866. Part 3: Remove some unnecessary 'virtual's. r=tnikkel
authorRobert O'Callahan <robert@ocallahan.org>
Fri, 04 Jan 2013 02:23:09 +1300
changeset 117495 638d614c55a54504fd798092b77cdec7b1bd9c7b
parent 117494 a428bfec3539bf79477dfba1e3f81c91ac1e1ce2
child 117496 53707172d724f98e6a28530bcc3b5b35028cbebf
push id24101
push usereakhgari@mozilla.com
push dateFri, 04 Jan 2013 17:24:40 +0000
treeherdermozilla-central@259982750c29 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstnikkel
bugs825866
milestone20.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 825866. Part 3: Remove some unnecessary 'virtual's. r=tnikkel
view/public/nsIView.h
--- a/view/public/nsIView.h
+++ b/view/public/nsIView.h
@@ -220,20 +220,18 @@ public:
    * Get the nearest widget in this view or a parent of this view and
    * the offset from the widget's origin to this view's origin
    * @param aOffset - if non-null the offset from this view's origin to the
    * widget's origin (usually positive) expressed in appunits of this will be
    * returned in aOffset.
    * @return the widget closest to this view; can be null because some view trees
    * don't have widgets at all (e.g., printing), but if any view in the view tree
    * has a widget, then it's safe to assume this will not return null
-   * XXX Remove this 'virtual' when gfx+widget are merged into gklayout;
-   * Mac widget depends on this method, which is BOGUS!
    */
-  virtual nsIWidget* GetNearestWidget(nsPoint* aOffset) const;
+  nsIWidget* GetNearestWidget(nsPoint* aOffset) const;
 
   /**
    * Create a widget to associate with this view.  This variant of
    * CreateWidget*() will look around in the view hierarchy for an
    * appropriate parent widget for the view.
    *
    * @param aWidgetInitData data used to initialize this view's widget before
    *        its create is called.
@@ -352,25 +350,25 @@ public:
   NS_IMETHOD  QueryInterface(const nsIID& aIID, void** aInstancePtr);
 
   /**
    * Called to indicate that the position of the view has been changed.
    * The specified coordinates are in the parent view's coordinate space.
    * @param x new x position
    * @param y new y position
    */
-  virtual void SetPosition(nscoord aX, nscoord aY);
+  void SetPosition(nscoord aX, nscoord aY);
   /**
    * Called to indicate that the dimensions of the view have been changed.
    * The x and y coordinates may be < 0, indicating that the view extends above
    * or to the left of its origin position. The term 'dimensions' indicates it
    * is relative to this view.
    */
-  virtual void SetDimensions(const nsRect &aRect, bool aPaint = true,
-                             bool aResizeWidget = true);
+  void SetDimensions(const nsRect &aRect, bool aPaint = true,
+                     bool aResizeWidget = true);
 
   /**
    * Called to indicate that the visibility of a view has been
    * changed.
    * @param visibility new visibility state
    */
   NS_IMETHOD  SetVisibility(nsViewVisibility visibility);