Skip to content

Commit

Permalink
composite: Remove unnecessary variable.
Browse files Browse the repository at this point in the history
We know that there is damage if the dynamic block handler is registered.

Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
  • Loading branch information
Pauli Nieminen authored and fooishbar committed Dec 31, 2010
1 parent c038b8b commit ed8db09
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 12 deletions.
12 changes: 2 additions & 10 deletions composite/compalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,8 @@
static void
compScreenUpdate (ScreenPtr pScreen)
{
CompScreenPtr cs = GetCompScreen (pScreen);

compCheckTree (pScreen);
if (cs->damaged)
{
compWindowUpdate (pScreen->root);
cs->damaged = FALSE;
}
compWindowUpdate (pScreen->root);
}

static void
Expand Down Expand Up @@ -85,11 +79,9 @@ compReportDamage (DamagePtr pDamage, RegionPtr pRegion, void *closure)
CompScreenPtr cs = GetCompScreen (pScreen);
CompWindowPtr cw = GetCompWindow (pWin);

if (!cs->damaged) {
if (!cs->BlockHandler) {
cs->BlockHandler = pScreen->BlockHandler;
pScreen->BlockHandler = compBlockHandler;

cs->damaged = TRUE;
}
cw->damaged = TRUE;
}
Expand Down
1 change: 0 additions & 1 deletion composite/compinit.c
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,6 @@ compScreenInit (ScreenPtr pScreen)
if (!cs)
return FALSE;

cs->damaged = FALSE;
cs->overlayWid = FakeClientID(0);
cs->pOverlayWin = NULL;
cs->pOverlayClients = NULL;
Expand Down
1 change: 0 additions & 1 deletion composite/compint.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ typedef struct _CompScreen {

ScreenBlockHandlerProcPtr BlockHandler;
CloseScreenProcPtr CloseScreen;
Bool damaged;
int numAlternateVisuals;
VisualID *alternateVisuals;

Expand Down

0 comments on commit ed8db09

Please sign in to comment.