Bug 1264183. Remove unused argument to nsView::InvalidateHierarchy. r=mats
authorTimothy Nikkel <tnikkel@gmail.com>
Fri, 22 Apr 2016 00:17:15 -0500
changeset 318225 247104f5d57dbc5ab282d5ea77f60cce9bdd9669
parent 318224 d813b20917fc269ebc213cb3013b1cb3b056a99c
child 318226 e5a28cdb7f92bb50284d4e6df4e724f6259d581e
push id9480
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 17:12:58 +0000
treeherdermozilla-aurora@0d6a91c76a9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmats
bugs1264183
milestone48.0a1
Bug 1264183. Remove unused argument to nsView::InvalidateHierarchy. r=mats
view/nsView.cpp
view/nsView.h
--- a/view/nsView.cpp
+++ b/view/nsView.cpp
@@ -435,23 +435,23 @@ void nsView::SetVisibility(nsViewVisibil
 void nsView::SetFloating(bool aFloatingView)
 {
 	if (aFloatingView)
 		mVFlags |= NS_VIEW_FLAG_FLOATING;
 	else
 		mVFlags &= ~NS_VIEW_FLAG_FLOATING;
 }
 
-void nsView::InvalidateHierarchy(nsViewManager *aViewManagerParent)
+void nsView::InvalidateHierarchy()
 {
   if (mViewManager->GetRootView() == this)
     mViewManager->InvalidateHierarchy();
 
   for (nsView *child = mFirstChild; child; child = child->GetNextSibling())
-    child->InvalidateHierarchy(aViewManagerParent);
+    child->InvalidateHierarchy();
 }
 
 void nsView::InsertChild(nsView *aChild, nsView *aSibling)
 {
   NS_PRECONDITION(nullptr != aChild, "null ptr");
 
   if (nullptr != aChild)
   {
@@ -472,17 +472,17 @@ void nsView::InsertChild(nsView *aChild,
     aChild->SetParent(this);
 
     // If we just inserted a root view, then update the RootViewManager
     // on all view managers in the new subtree.
 
     nsViewManager *vm = aChild->GetViewManager();
     if (vm->GetRootView() == aChild)
     {
-      aChild->InvalidateHierarchy(nullptr); // don't care about releasing grabs
+      aChild->InvalidateHierarchy();
     }
   }
 }
 
 void nsView::RemoveChild(nsView *child)
 {
   NS_PRECONDITION(nullptr != child, "null ptr");
 
@@ -508,17 +508,17 @@ void nsView::RemoveChild(nsView *child)
     NS_ASSERTION(found, "tried to remove non child");
 
     // If we just removed a root view, then update the RootViewManager
     // on all view managers in the removed subtree.
 
     nsViewManager *vm = child->GetViewManager();
     if (vm->GetRootView() == child)
     {
-      child->InvalidateHierarchy(GetViewManager());
+      child->InvalidateHierarchy();
     }
   }
 }
 
 // Native widgets ultimately just can't deal with the awesome power of
 // CSS2 z-index. However, we set the z-index on the widget anyway
 // because in many simple common cases the widgets do end up in the
 // right order. We set each widget's z-index to the z-index of the
--- a/view/nsView.h
+++ b/view/nsView.h
@@ -453,21 +453,18 @@ private:
   void InsertChild(nsView *aChild, nsView *aSibling);
   void RemoveChild(nsView *aChild);
 
   void ResetWidgetBounds(bool aRecurse, bool aForceSync);
   void AssertNoWindow();
 
   void NotifyEffectiveVisibilityChanged(bool aEffectivelyVisible);
 
-  // Update the cached RootViewManager for all view manager descendents,
-  // If the hierarchy is being removed, aViewManagerParent points to the view
-  // manager for the hierarchy's old parent, and will have its mouse grab
-  // released if it points to any view in this view hierarchy.
-  void InvalidateHierarchy(nsViewManager *aViewManagerParent);
+  // Update the cached RootViewManager for all view manager descendents.
+  void InvalidateHierarchy();
 
   nsViewManager    *mViewManager;
   nsView           *mParent;
   nsCOMPtr<nsIWidget> mWindow;
   nsCOMPtr<nsIWidget> mPreviousWindow;
   nsView           *mNextSibling;
   nsView           *mFirstChild;
   nsIFrame         *mFrame;