Tweak PaintInvalidationReasons

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
  *               (http://www.torchmobile.com/)
@@ skipping 1172 matching lines @@
   DCHECK_EQ(&paint_invalidation_state.CurrentObject(), this);
 
   if (StyleRef().HasOutline()) {
     PaintLayer& layer = paint_invalidation_state.PaintingLayer();
     if (&layer.GetLayoutObject() != this)
       layer.SetNeedsPaintPhaseDescendantOutlines();
   }
 
   LayoutView* v = View();
   if (v->GetDocument().Printing())
-    return kPaintInvalidationNone;  // Don't invalidate paints if we're
-                                    // printing.
+    return PaintInvalidationReason::kNone;  // Don't invalidate paints if we're
+                                            // printing.
 
   PaintInvalidatorContextAdapter context(paint_invalidation_state);
 
   const LayoutBoxModelObject& paint_invalidation_container =
       paint_invalidation_state.PaintInvalidationContainer();
   DCHECK(paint_invalidation_container == ContainerForPaintInvalidation());
 
   ObjectPaintInvalidator paint_invalidator(*this);
   context.old_visual_rect = VisualRect();
   context.old_location = paint_invalidator.LocationInBacking();
   LayoutRect new_visual_rect =
       paint_invalidation_state.ComputeVisualRectInBacking();
   context.new_location = paint_invalidation_state.ComputeLocationInBacking(
       new_visual_rect.Location());
 
   SetVisualRect(new_visual_rect);
   paint_invalidator.SetLocationInBacking(context.new_location);
 
   if (!ShouldCheckForPaintInvalidation() &&
       paint_invalidation_state
           .ForcedSubtreeInvalidationRectUpdateWithinContainerOnly()) {
     // We are done updating the visual rect. No other paint invalidation work
     // to do for this object.
-    return kPaintInvalidationNone;
+    return PaintInvalidationReason::kNone;
   }
 
   return InvalidatePaint(context);
 }
 
 DISABLE_CFI_PERF
 PaintInvalidationReason LayoutObject::InvalidatePaint(
     const PaintInvalidatorContext& context) const {
   return ObjectPaintInvalidatorWithContext(*this, context).InvalidatePaint();
 }
@@ skipping 2160 matching lines @@
 }
 
 bool LayoutObject::IsRelayoutBoundaryForInspector() const {
   return ObjectIsRelayoutBoundary(this);
 }
 
 static PaintInvalidationReason DocumentLifecycleBasedPaintInvalidationReason(
     const DocumentLifecycle& document_lifecycle) {
   switch (document_lifecycle.GetState()) {
     case DocumentLifecycle::kInStyleRecalc:
-      return kPaintInvalidationStyleChange;
+      return PaintInvalidationReason::kStyle;
     case DocumentLifecycle::kInPreLayout:
     case DocumentLifecycle::kInPerformLayout:
     case DocumentLifecycle::kAfterPerformLayout:
-      return kPaintInvalidationForcedByLayout;
+      return PaintInvalidationReason::kGeometry;
     case DocumentLifecycle::kInCompositingUpdate:
-      return kPaintInvalidationCompositingUpdate;
+      return PaintInvalidationReason::kCompositing;
     default:
-      return kPaintInvalidationFull;
+      return PaintInvalidationReason::kFull;
   }
 }
 
 inline void LayoutObject::MarkAncestorsForPaintInvalidation() {
   for (LayoutObject* parent = this->ParentCrossingFrames();
        parent && !parent->ShouldCheckForPaintInvalidation();
        parent = parent->ParentCrossingFrames())
     parent->bitfields_.SetMayNeedPaintInvalidation(true);
 }
 
@@ skipping 43 matching lines @@
   SetShouldDoFullPaintInvalidationWithoutGeometryChange(reason);
 }
 
 void LayoutObject::SetShouldDoFullPaintInvalidationWithoutGeometryChange(
     PaintInvalidationReason reason) {
   // Only full invalidation reasons are allowed.
   DCHECK(IsFullPaintInvalidationReason(reason));
 
   bool is_upgrading_delayed_full_to_full =
       bitfields_.FullPaintInvalidationReason() ==
-          kPaintInvalidationDelayedFull &&
-      reason != kPaintInvalidationDelayedFull;
+          PaintInvalidationReason::kDelayedFull &&
+      reason != PaintInvalidationReason::kDelayedFull;
 
-  if (bitfields_.FullPaintInvalidationReason() == kPaintInvalidationNone ||
+  if (bitfields_.FullPaintInvalidationReason() ==
+          PaintInvalidationReason::kNone ||
       is_upgrading_delayed_full_to_full) {
-    if (reason == kPaintInvalidationFull)
+    if (reason == PaintInvalidationReason::kFull) {
       reason = DocumentLifecycleBasedPaintInvalidationReason(
           GetDocument().Lifecycle());
+    }
     bitfields_.SetFullPaintInvalidationReason(reason);
     if (!is_upgrading_delayed_full_to_full)
       MarkAncestorsForPaintInvalidation();
   }
 
   GetFrameView()->ScheduleVisualUpdateForPaintInvalidationIfNeeded();
 }
 
 void LayoutObject::SetMayNeedPaintInvalidation() {
   SetNeedsPaintOffsetAndVisualRectUpdate();
@@ skipping 50 matching lines @@
 bool DeprecatedDisableModifyLayoutTreeStructureAsserts::
     CanModifyLayoutTreeStateInAnyState() {
   return g_modify_layout_tree_structure_any_state;
 }
 
 void LayoutObject::
     SetShouldDoFullPaintInvalidationIncludingNonCompositingDescendants() {
   // Clear first because PaintInvalidationSubtree overrides other full paint
   // invalidation reasons.
   ClearShouldDoFullPaintInvalidation();
-  SetShouldDoFullPaintInvalidation(kPaintInvalidationSubtree);
+  SetShouldDoFullPaintInvalidation(PaintInvalidationReason::kSubtree);
 }
 
 void LayoutObject::SetIsBackgroundAttachmentFixedObject(
     bool is_background_attachment_fixed_object) {
   DCHECK(GetFrameView());
   if (bitfields_.IsBackgroundAttachmentFixedObject() ==
       is_background_attachment_fixed_object)
     return;
   bitfields_.SetIsBackgroundAttachmentFixedObject(
       is_background_attachment_fixed_object);
@@ skipping 86 matching lines @@
     const blink::LayoutObject* root = object1;
     while (root->Parent())
       root = root->Parent();
     root->ShowLayoutTreeAndMark(object1, "*", object2, "-", 0);
   } else {
     WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
   }
 }
 
 #endif