Tweak PaintInvalidationReasons

third_party/WebKit/Source/core/paint/ObjectPaintInvalidatorTest.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/ObjectPaintInvalidator.h"
 
 #include "core/layout/LayoutObject.h"
 #include "core/layout/LayoutTestHelper.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/json/JSONValues.h"
@@ skipping 27 matching lines @@
       "style='position: relative'></div>"
       "    <div "
       "id='non-stacked-layered-child-of-composited-non-stacking-context' "
       "style='overflow: scroll'></div>"
       "  </div>"
       "</div>");
 
   GetDocument().View()->SetTracksPaintInvalidations(true);
   ObjectPaintInvalidator(*GetLayoutObjectByElementId("container"))
       .InvalidateDisplayItemClientsIncludingNonCompositingDescendants(
-          kPaintInvalidationSubtree);
+          PaintInvalidationReason::kSubtree);
   std::unique_ptr<JSONArray> invalidations =
       GetDocument().View()->TrackedObjectPaintInvalidationsAsJSON();
   GetDocument().View()->SetTracksPaintInvalidations(false);
 
   ASSERT_EQ(4u, invalidations->size());
   String s;
   JSONObject::Cast(invalidations->at(0))->Get("object")->AsString(&s);
   EXPECT_EQ(GetLayoutObjectByElementId("container")->DebugName(), s);
   JSONObject::Cast(invalidations->at(1))->Get("object")->AsString(&s);
   EXPECT_EQ(GetLayoutObjectByElementId("normal-child")->DebugName(), s);
@@ skipping 37 matching lines @@
   EXPECT_TRUE(span->IsPaintInvalidationContainer());
   EXPECT_TRUE(span->StyleRef().IsStackingContext());
   EXPECT_EQ(composited_container, &target->ContainerForPaintInvalidation());
   EXPECT_EQ(containing_block_layer, target->PaintingLayer());
 
   // Traversing from target should mark needsRepaint on correct layers.
   EXPECT_FALSE(containing_block_layer->NeedsRepaint());
   EXPECT_FALSE(composited_container_layer->NeedsRepaint());
   ObjectPaintInvalidator(*target)
       .InvalidateDisplayItemClientsIncludingNonCompositingDescendants(
-          kPaintInvalidationSubtree);
+          PaintInvalidationReason::kSubtree);
   EXPECT_TRUE(containing_block_layer->NeedsRepaint());
   EXPECT_TRUE(composited_container_layer->NeedsRepaint());
   EXPECT_FALSE(span_layer->NeedsRepaint());
 
   GetDocument().View()->UpdateAllLifecyclePhases();
 
   // Traversing from span should mark needsRepaint on correct layers for target.
   EXPECT_FALSE(containing_block_layer->NeedsRepaint());
   EXPECT_FALSE(composited_container_layer->NeedsRepaint());
   ObjectPaintInvalidator(*span)
       .InvalidateDisplayItemClientsIncludingNonCompositingDescendants(
-          kPaintInvalidationSubtree);
+          PaintInvalidationReason::kSubtree);
   EXPECT_TRUE(containing_block_layer->NeedsRepaint());
   EXPECT_TRUE(composited_container_layer->NeedsRepaint());
   EXPECT_TRUE(span_layer->NeedsRepaint());
 
   GetDocument().View()->UpdateAllLifecyclePhases();
 
   // Traversing from compositedContainer should reach target.
   GetDocument().View()->SetTracksPaintInvalidations(true);
   EXPECT_FALSE(containing_block_layer->NeedsRepaint());
   EXPECT_FALSE(composited_container_layer->NeedsRepaint());
   ObjectPaintInvalidator(*composited_container)
       .InvalidateDisplayItemClientsIncludingNonCompositingDescendants(
-          kPaintInvalidationSubtree);
+          PaintInvalidationReason::kSubtree);
   EXPECT_TRUE(containing_block_layer->NeedsRepaint());
   EXPECT_TRUE(composited_container_layer->NeedsRepaint());
   EXPECT_FALSE(span_layer->NeedsRepaint());
 
   std::unique_ptr<JSONArray> invalidations =
       GetDocument().View()->TrackedObjectPaintInvalidationsAsJSON();
   GetDocument().View()->SetTracksPaintInvalidations(false);
 
   ASSERT_EQ(4u, invalidations->size());
   String s;
@@ skipping 46 matching lines @@
   EXPECT_TRUE(inner_span->StyleRef().IsStackingContext());
   EXPECT_EQ(composited_container, &target->ContainerForPaintInvalidation());
   EXPECT_EQ(containing_block_layer, target->PaintingLayer());
 
   // Traversing from compositedContainer should reach target.
   GetDocument().View()->SetTracksPaintInvalidations(true);
   EXPECT_FALSE(containing_block_layer->NeedsRepaint());
   EXPECT_FALSE(composited_container_layer->NeedsRepaint());
   ObjectPaintInvalidator(*composited_container)
       .InvalidateDisplayItemClientsIncludingNonCompositingDescendants(
-          kPaintInvalidationSubtree);
+          PaintInvalidationReason::kSubtree);
   EXPECT_TRUE(containing_block_layer->NeedsRepaint());
   EXPECT_TRUE(composited_container_layer->NeedsRepaint());
   EXPECT_FALSE(span_layer->NeedsRepaint());
   EXPECT_FALSE(inner_span_layer->NeedsRepaint());
 
   std::unique_ptr<JSONArray> invalidations =
       GetDocument().View()->TrackedObjectPaintInvalidationsAsJSON();
   GetDocument().View()->SetTracksPaintInvalidations(false);
 
   ASSERT_EQ(4u, invalidations->size());
@@ skipping 27 matching lines @@
   EXPECT_TRUE(span->IsPaintInvalidationContainer());
   EXPECT_TRUE(span->StyleRef().IsStackingContext());
   EXPECT_EQ(span, &target->ContainerForPaintInvalidation());
   EXPECT_EQ(target_layer, target->PaintingLayer());
 
   // Traversing from span should reach target.
   GetDocument().View()->SetTracksPaintInvalidations(true);
   EXPECT_FALSE(span_layer->NeedsRepaint());
   ObjectPaintInvalidator(*span)
       .InvalidateDisplayItemClientsIncludingNonCompositingDescendants(
-          kPaintInvalidationSubtree);
+          PaintInvalidationReason::kSubtree);
   EXPECT_TRUE(span_layer->NeedsRepaint());
 
   std::unique_ptr<JSONArray> invalidations =
       GetDocument().View()->TrackedObjectPaintInvalidationsAsJSON();
   GetDocument().View()->SetTracksPaintInvalidations(false);
 
   ASSERT_EQ(3u, invalidations->size());
   String s;
   JSONObject::Cast(invalidations->at(0))->Get("object")->AsString(&s);
   EXPECT_EQ(span->DebugName(), s);
   JSONObject::Cast(invalidations->at(1))->Get("object")->AsString(&s);
   EXPECT_EQ("LayoutText #text", s);
   JSONObject::Cast(invalidations->at(2))->Get("object")->AsString(&s);
   EXPECT_EQ(target->DebugName(), s);
 }
 
 }  // namespace blink