Commit 6e288228 authored by Markus Stange's avatar Markus Stange
Browse files

Bug 598482 part 9 - Remove unused aIgnoreWidgetView argument. r=roc

parent 7b0b52dc

view/src/nsViewManager.cpp

+3 −11
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ void nsViewManager::ProcessPendingUpdates(nsView* aView, bool aDoInvalidate) 
      nsViewManager* widgetVM = nearestViewWithWidget->GetViewManager();

      widgetVM->

        UpdateWidgetArea(nearestViewWithWidget,

                         nearestViewWithWidget->GetWidget(), r, nsnull);

                         nearestViewWithWidget->GetWidget(), r);

      dirtyRegion->SetEmpty();

    }

  }
@@ -451,13 +451,10 @@ NS_IMETHODIMP nsViewManager::UpdateView(nsIView *aView) 
 * will return null but nsView::GetViewFor(aWidget) returns aWidgetview

 * @param aDamagedRegion this region, relative to aWidgetView, is invalidated in

 * every widget child of aWidgetView, plus aWidgetView's own widget

 * @param aIgnoreWidgetView if non-null, the aIgnoreWidgetView's widget and its

 * children are not updated.

 */

void

nsViewManager::UpdateWidgetArea(nsView *aWidgetView, nsIWidget* aWidget,

                                const nsRegion &aDamagedRegion,

                                nsView* aIgnoreWidgetView)

                                const nsRegion &aDamagedRegion)

{

  NS_ASSERTION(aWidgetView->GetViewManager() == this,

               "UpdateWidgetArea called on view we don't own");
@@ -501,11 +498,6 @@ nsViewManager::UpdateWidgetArea(nsView *aWidgetView, nsIWidget* aWidget, 
      return;

  }



  if (aWidgetView == aIgnoreWidgetView) {

    // the widget for aIgnoreWidgetView (and its children) should be treated as already updated.

    return;

  }



  if (!aWidget) {

    // The root view or a scrolling view might not have a widget

    // (for example, during printing). We get here when we scroll
@@ -617,7 +609,7 @@ NS_IMETHODIMP nsViewManager::UpdateViewNoSuppression(nsIView *aView, 
  PRInt32 APD = AppUnitsPerDevPixel();

  damagedRect = damagedRect.ConvertAppUnitsRoundOut(APD, rootAPD);

  displayRootVM->UpdateWidgetArea(displayRoot, displayRoot->GetWidget(),

                                  nsRegion(damagedRect), nsnull);

                                  nsRegion(damagedRect));



  return NS_OK;

}

view/src/nsViewManager.h

+1 −2
Original line number Diff line number Diff line
@@ -159,8 +159,7 @@ private: 
  void ReparentChildWidgets(nsIView* aView, nsIWidget *aNewWidget);

  void ReparentWidgets(nsIView* aView, nsIView *aParent);

  void UpdateWidgetArea(nsView *aWidgetView, nsIWidget* aWidget,

                        const nsRegion &aDamagedRegion,

                        nsView* aIgnoreWidgetView);

                        const nsRegion &aDamagedRegion);



  void UpdateViews(nsView *aView);