[PATCH 33/37] composite: Factor out backing store transition

[Jasper St. Pierre]

No? He removed the brace so it's a one-line if body.

On Mon, Oct 27, 2014 at 4:34 PM, Keith Packard <keithp at keithp.com> wrote:

> Adam Jackson <ajax at redhat.com> writes:
>
> > No functional change.
> >
> > Signed-off-by: Adam Jackson <ajax at redhat.com>
> > ---
> >  composite/compinit.c | 27 ++++++++++++++++-----------
> >  1 file changed, 16 insertions(+), 11 deletions(-)
> >
> > diff --git a/composite/compinit.c b/composite/compinit.c
> > index 111c16e..7daf171 100644
> > --- a/composite/compinit.c
> > +++ b/composite/compinit.c
> > @@ -104,6 +104,20 @@ compInstallColormap(ColormapPtr pColormap)
> >      pScreen->InstallColormap = compInstallColormap;
> >  }
> >
> > +static void
> > +compCheckBackingStore(WindowPtr pWin)
> > +{
> > +    if (pWin->backingStore != NotUseful && !pWin->backStorage) {
> > +        compRedirectWindow(serverClient, pWin,
> CompositeRedirectAutomatic);
> > +        pWin->backStorage = TRUE;
> > +    }
> > +    else if (pWin->backingStore == NotUseful && pWin->backStorage) {
> > +        compUnredirectWindow(serverClient, pWin,
> > +                             CompositeRedirectAutomatic);
> > +        pWin->backStorage = FALSE;
> > +    }
> > +}
> > +
> >  /* Fake backing store via automatic redirection */
> >  static Bool
> >  compChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
> > @@ -116,17 +130,8 @@ compChangeWindowAttributes(WindowPtr pWin, unsigned
> long mask)
> >      ret = pScreen->ChangeWindowAttributes(pWin, mask);
> >
> >      if (ret && (mask & CWBackingStore) &&
> > -        pScreen->backingStoreSupport != NotUseful) {
> > -        if (pWin->backingStore != NotUseful && !pWin->backStorage) {
> > -            compRedirectWindow(serverClient, pWin,
> CompositeRedirectAutomatic);
> > -            pWin->backStorage = TRUE;
> > -        }
> > -        else if (pWin->backingStore == NotUseful && pWin->backStorage) {
> > -            compUnredirectWindow(serverClient, pWin,
> > -                                 CompositeRedirectAutomatic);
> > -            pWin->backStorage = FALSE;
> > -        }
> > -    }
> > +        pScreen->backingStoreSupport != NotUseful)
> > +        compCheckBackingStore(pWin);
> >
>
> Looks like this is missing a } here?
>
> --
> keith.packard at intel.com
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>



-- 
  Jasper
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20141027/9d1a51f1/attachment-0001.html>