Tweak PaintInvalidationReasons

third_party/WebKit/Source/core/layout/LayoutBox.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1709 matching lines @@
   return ForegroundIsKnownToBeOpaqueInRect(background_rect,
                                            kBackgroundObscurationTestMaxDepth);
 }
 
 void LayoutBox::PaintMask(const PaintInfo& paint_info,
                           const LayoutPoint& paint_offset) const {
   BoxPainter(*this).PaintMask(paint_info, paint_offset);
 }
 
 void LayoutBox::ImageChanged(WrappedImagePtr image, const IntRect*) {
-  // TODO(chrishtr): support kPaintInvalidationDelayedFull for animated border
-  // images.
+  // TODO(chrishtr): support PaintInvalidationReason::kDelayedFull for animated
+  // border images.
   if ((StyleRef().BorderImage().GetImage() &&
        StyleRef().BorderImage().GetImage()->Data() == image) ||
       (StyleRef().MaskBoxImage().GetImage() &&
        StyleRef().MaskBoxImage().GetImage()->Data() == image) ||
       (StyleRef().BoxReflect() && StyleRef().BoxReflect()->Mask().GetImage() &&
        StyleRef().BoxReflect()->Mask().GetImage()->Data() == image)) {
-    SetShouldDoFullPaintInvalidationWithoutGeometryChange();
+    SetShouldDoFullPaintInvalidationWithoutGeometryChange(
+        PaintInvalidationReason::kImage);
   } else {
     for (const FillLayer* layer = &StyleRef().MaskLayers(); layer;
          layer = layer->Next()) {
       if (layer->GetImage() && image == layer->GetImage()->Data()) {
-        SetShouldDoFullPaintInvalidationWithoutGeometryChange();
+        SetShouldDoFullPaintInvalidationWithoutGeometryChange(
+            PaintInvalidationReason::kImage);
         break;
       }
     }
   }
 
   if (!IsDocumentElement() && !BackgroundStolenForBeingBody()) {
     for (const FillLayer* layer = &StyleRef().BackgroundLayers(); layer;
          layer = layer->Next()) {
       if (layer->GetImage() && image == layer->GetImage()->Data()) {
         InvalidateBackgroundObscurationStatus();
         bool maybe_animated =
             layer->GetImage()->CachedImage() &&
             layer->GetImage()->CachedImage()->GetImage() &&
             layer->GetImage()->CachedImage()->GetImage()->MaybeAnimated();
         if (maybe_animated) {
           SetMayNeedPaintInvalidationAnimatedBackgroundImage();
         } else {
-          SetShouldDoFullPaintInvalidationWithoutGeometryChange();
+          SetShouldDoFullPaintInvalidationWithoutGeometryChange(
+              PaintInvalidationReason::kImage);
           SetBackgroundChangedSinceLastPaintInvalidation();
         }
         break;
       }
     }
   }
 
   ShapeValue* shape_outside_value = Style()->ShapeOutside();
   if (!GetFrameView()->IsInPerformLayout() && IsFloating() &&
       shape_outside_value && shape_outside_value->GetImage() &&
@@ skipping 62 matching lines @@
   return rect.Intersects(LayoutRect(
       layout_view->GetFrameView()->GetScrollableArea()->VisibleContentRect()));
 }
 
 void LayoutBox::EnsureIsReadyForPaintInvalidation() {
   LayoutBoxModelObject::EnsureIsReadyForPaintInvalidation();
 
   if (MayNeedPaintInvalidationAnimatedBackgroundImage() &&
       !BackgroundIsKnownToBeObscured()) {
     SetShouldDoFullPaintInvalidationWithoutGeometryChange(
-        kPaintInvalidationDelayedFull);
+        PaintInvalidationReason::kDelayedFull);
   }
 
-  if (FullPaintInvalidationReason() != kPaintInvalidationDelayedFull ||
+  if (FullPaintInvalidationReason() != PaintInvalidationReason::kDelayedFull ||
       !IntersectsVisibleViewport())
     return;
 
   // Do regular full paint invalidation if the object with
-  // kPaintInvalidationDelayedFull is onscreen.
+  // PaintInvalidationReason::kDelayedFull is onscreen.
   // Conservatively assume the delayed paint invalidation was caused by
   // background image change.
   SetBackgroundChangedSinceLastPaintInvalidation();
-  SetShouldDoFullPaintInvalidationWithoutGeometryChange(kPaintInvalidationFull);
+  SetShouldDoFullPaintInvalidationWithoutGeometryChange(
+      PaintInvalidationReason::kFull);
 }
 
 PaintInvalidationReason LayoutBox::DeprecatedInvalidatePaint(
     const PaintInvalidationState& paint_invalidation_state) {
   if (HasBoxDecorationBackground()
       // We also paint overflow controls in background phase.
       || (HasOverflowClip() && GetScrollableArea()->HasOverflowControls())) {
     PaintLayer& layer = paint_invalidation_state.PaintingLayer();
     if (&layer.GetLayoutObject() != this)
       layer.SetNeedsPaintPhaseDescendantBlockBackgrounds();
@@ skipping 3994 matching lines @@
 void LayoutBox::MutableForPainting::
     SavePreviousContentBoxSizeAndLayoutOverflowRect() {
   auto& rare_data = GetLayoutBox().EnsureRareData();
   rare_data.has_previous_content_box_size_and_layout_overflow_rect_ = true;
   rare_data.previous_content_box_size_ = GetLayoutBox().ContentBoxRect().Size();
   rare_data.previous_layout_overflow_rect_ =
       GetLayoutBox().LayoutOverflowRect();
 }
 
 }  // namespace blink