| Index: ui/compositor/paint_context.h
|
| diff --git a/ui/compositor/paint_context.h b/ui/compositor/paint_context.h
|
| index a754ee469858b80a69c22be61b744aa9c006be79..d63f11f7852b44c328b0cef7f855a0c0b1eef8de 100644
|
| --- a/ui/compositor/paint_context.h
|
| +++ b/ui/compositor/paint_context.h
|
| @@ -56,20 +56,15 @@
|
| return PaintContext(canvas_);
|
| }
|
|
|
| - // When true, IsRectInvalid() can be called, otherwise its result would be
|
| + // When true, IsRectInvalidated() can be called, otherwise its result would be
|
| // invalid.
|
| - bool CanCheckInvalid() const { return !invalidation_.IsEmpty(); }
|
| -
|
| - // When true, if a thing is not invalidated it does not need to paint itself.
|
| - // When false, everything should provide an output when painting regardless of
|
| - // being invalidated in order to remain visible.
|
| - bool ShouldEarlyOutOfPaintingWhenValid() const { return !!canvas_; }
|
| + bool CanCheckInvalidated() const { return !invalidation_.IsEmpty(); }
|
|
|
| // When true, the |bounds| touches an invalidated area, so should be
|
| // re-painted. When false, re-painting can be skipped. Bounds should be in
|
| // the local space with offsets up to the painting root in the PaintContext.
|
| - bool IsRectInvalid(const gfx::Rect& bounds) const {
|
| - DCHECK(CanCheckInvalid());
|
| + bool IsRectInvalidated(const gfx::Rect& bounds) const {
|
| + DCHECK(CanCheckInvalidated());
|
| return invalidation_.Intersects(bounds + offset_);
|
| }
|
|
|
| @@ -91,9 +86,6 @@
|
| friend class ClipTransformRecorder;
|
| friend class CompositingRecorder;
|
| friend class PaintRecorder;
|
| - // The Cache class also needs to access the DisplayItemList to append its
|
| - // cache contents.
|
| - friend class PaintCache;
|
|
|
| PaintContext& operator=(const PaintContext& other) = delete;
|
|
|
|
|