wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Markus Stange 2011-12-23 22:52:22 -05:00
parent 824c723ed8
commit 23cd2039c1
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
view/src/nsViewManager.cpp
View File

@ -433,7 +433,7 @@ void nsViewManager::ProcessPendingUpdates(nsView* aView, bool aDoInvalidate)
nsViewManager* widgetVM = nearestViewWithWidget->GetViewManager(); nsViewManager* widgetVM = nearestViewWithWidget->GetViewManager();
widgetVM-> widgetVM->
UpdateWidgetArea(nearestViewWithWidget, UpdateWidgetArea(nearestViewWithWidget,
nearestViewWithWidget->GetWidget(), r, nsnull); nearestViewWithWidget->GetWidget(), r);
dirtyRegion->SetEmpty(); dirtyRegion->SetEmpty();
} }
} }
@ -451,13 +451,10 @@ NS_IMETHODIMP nsViewManager::UpdateView(nsIView *aView)
* will return null but nsView::GetViewFor(aWidget) returns aWidgetview * will return null but nsView::GetViewFor(aWidget) returns aWidgetview
* @param aDamagedRegion this region, relative to aWidgetView, is invalidated in * @param aDamagedRegion this region, relative to aWidgetView, is invalidated in
* every widget child of aWidgetView, plus aWidgetView's own widget * 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 void
nsViewManager::UpdateWidgetArea(nsView *aWidgetView, nsIWidget* aWidget, nsViewManager::UpdateWidgetArea(nsView *aWidgetView, nsIWidget* aWidget,
const nsRegion &aDamagedRegion, const nsRegion &aDamagedRegion)
nsView* aIgnoreWidgetView)
{ {
NS_ASSERTION(aWidgetView->GetViewManager() == this, NS_ASSERTION(aWidgetView->GetViewManager() == this,
"UpdateWidgetArea called on view we don't own"); "UpdateWidgetArea called on view we don't own");
@ -501,11 +498,6 @@ nsViewManager::UpdateWidgetArea(nsView *aWidgetView, nsIWidget* aWidget,
return; return;
} }
if (aWidgetView == aIgnoreWidgetView) {
// the widget for aIgnoreWidgetView (and its children) should be treated as already updated.
return;
}
if (!aWidget) { if (!aWidget) {
// The root view or a scrolling view might not have a widget // The root view or a scrolling view might not have a widget
// (for example, during printing). We get here when we scroll // (for example, during printing). We get here when we scroll
@ -617,7 +609,7 @@ NS_IMETHODIMP nsViewManager::UpdateViewNoSuppression(nsIView *aView,
PRInt32 APD = AppUnitsPerDevPixel(); PRInt32 APD = AppUnitsPerDevPixel();
damagedRect = damagedRect.ConvertAppUnitsRoundOut(APD, rootAPD); damagedRect = damagedRect.ConvertAppUnitsRoundOut(APD, rootAPD);
displayRootVM->UpdateWidgetArea(displayRoot, displayRoot->GetWidget(), displayRootVM->UpdateWidgetArea(displayRoot, displayRoot->GetWidget(),
nsRegion(damagedRect), nsnull); nsRegion(damagedRect));
return NS_OK; return NS_OK;
} }

3
view/src/nsViewManager.h
View File

@ -159,8 +159,7 @@ private:
void ReparentChildWidgets(nsIView* aView, nsIWidget *aNewWidget); void ReparentChildWidgets(nsIView* aView, nsIWidget *aNewWidget);
void ReparentWidgets(nsIView* aView, nsIView *aParent); void ReparentWidgets(nsIView* aView, nsIView *aParent);
void UpdateWidgetArea(nsView *aWidgetView, nsIWidget* aWidget, void UpdateWidgetArea(nsView *aWidgetView, nsIWidget* aWidget,
const nsRegion &aDamagedRegion, const nsRegion &aDamagedRegion);
nsView* aIgnoreWidgetView);
void UpdateViews(nsView *aView); void UpdateViews(nsView *aView);