[SPv175+] Support partial invalidation for selections

Bug: 732612
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: I685af535011500633865953799a6c4ae128ab5e8
Reviewed-on: https://chromium-review.googlesource.com/820043Reviewed-by: Chris Harrelson <chrishtr@chromium.org>
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523454}

third_party/WebKit/LayoutTests/TestExpectations

@@ -86,7 +86,6 @@ crbug.com/771643 virtual/spv175/compositing/squashing/squash-overflow-hidden-scr
 crbug.com/771643 virtual/spv175/compositing/squashing/squash-with-ancestor-reflection.html [ Failure ]
 crbug.com/771643 virtual/spv175/compositing/visibility/visibility-image-layers.html [ Failure Pass ]
 crbug.com/771643 virtual/spv175/paint/invalidation/offset-change-wrong-invalidation-with-float.html [ Failure ]
-crbug.com/771643 virtual/spv175/paint/invalidation/repaint-across-writing-mode-boundary.html [ Failure ]
 crbug.com/771643 virtual/spv175/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint.html [ Failure ]
 crbug.com/771643 virtual/spv175/paint/invalidation/compositing/subpixel-offset-scaled-transform-composited.html [ Failure ]
 crbug.com/771643 virtual/spv175/paint/invalidation/forms/select-option-background-color.html [ Failure ]
@@ -97,7 +96,6 @@ crbug.com/771643 virtual/spv175/paint/invalidation/reflection/reflection-repaint
 crbug.com/771643 virtual/spv175/paint/invalidation/scroll/repaint-during-scroll-with-zoom.html [ Failure ]
 crbug.com/771643 virtual/spv175/paint/invalidation/scroll/resize-scrollable-iframe.html [ Failure ]
 crbug.com/771643 virtual/spv175/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects.html [ Failure ]
-crbug.com/771643 virtual/spv175/paint/invalidation/selection/selection-rl.html [ Failure ]
 crbug.com/771643 virtual/spv175/paint/invalidation/svg/absolute-sized-content-with-resources.xhtml [ Failure ]
 crbug.com/771643 virtual/spv175/paint/invalidation/svg/deep-dynamic-updates.svg [ Failure ]
 crbug.com/771643 virtual/spv175/paint/invalidation/svg/filter-refresh.svg [ Failure ]

third_party/WebKit/LayoutTests/flag-specific/enable-slimming-paint-v2/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt

@@ -8,7 +8,7 @@
       "paintInvalidations": [
         {
           "object": "InlineTextBox 'Should have blue, not gray, highlight'",
-          "rect": [18, 18, 234, 19],
+          "rect": [18, 18, 233, 19],
           "reason": "selection"
         }
       ]

third_party/WebKit/LayoutTests/virtual/spv175/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt

+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "paintInvalidations": [
+        {
+          "object": "InlineTextBox '\u7B2C\u4E00\u6BB5\u843D paragraph 1'",
+          "rect": [548, 191, 23, 36],
+          "reason": "selection"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "selection"
+    },
+    {
+      "object": "InlineTextBox '\u7B2C\u4E00\u6BB5\u843D paragraph 1'",
+      "reason": "selection"
+    }
+  ]
+}
+

third_party/WebKit/LayoutTests/virtual/spv175/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt

@@ -11,15 +11,15 @@
           "rect": [8, 24, 32, 17],
           "reason": "geometry"
         },
-        {
-          "object": "InlineTextBox 'a'",
-          "rect": [8, 8, 16, 17],
-          "reason": "selection"
-        },
         {
           "object": "InlineTextBox '\n'",
           "rect": [24, 8, 16, 16],
           "reason": "appeared"
+        },
+        {
+          "object": "InlineTextBox 'a'",
+          "rect": [8, 8, 16, 16],
+          "reason": "selection"
         }
       ]
     }

third_party/WebKit/LayoutTests/virtual/spv175/paint/invalidation/selection/selection-rl-expected.txt

+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "paintInvalidations": [
+        {
+          "object": "InlineTextBox 'Testing both hit testing'",
+          "rect": [773, 38, 19, 83],
+          "reason": "selection"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "selection"
+    },
+    {
+      "object": "InlineTextBox 'Testing both hit testing'",
+      "reason": "selection"
+    }
+  ]
+}
+

third_party/WebKit/LayoutTests/virtual/spv175/paint/invalidation/selection/selection-within-composited-scroller-expected.txt

@@ -27,7 +27,7 @@
       "paintInvalidations": [
         {
           "object": "InlineTextBox 'test'",
-          "rect": [0, 610, 22, 19],
+          "rect": [0, 610, 21, 19],
           "reason": "selection"
         }
       ],

third_party/WebKit/LayoutTests/virtual/spv175/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt

@@ -8,7 +8,7 @@
       "paintInvalidations": [
         {
           "object": "InlineTextBox 'Should have blue, not gray, highlight'",
-          "rect": [18, 18, 234, 19],
+          "rect": [18, 18, 233, 19],
           "reason": "selection"
         }
       ]

third_party/WebKit/LayoutTests/virtual/spv175/paint/invalidation/svg/text-selection-text-05-t-expected.txt

@@ -16,35 +16,35 @@
           "rect": [0, 0, 800, 600],
           "reason": "appeared"
         },
-        {
-          "object": "InlineTextBox 'text-anchor'",
-          "rect": [352, 12, 131, 36],
-          "reason": "selection"
-        },
         {
           "object": "LayoutSVGText text",
           "rect": [352, 12, 131, 36],
           "reason": "appeared"
         },
         {
-          "object": "InlineTextBox 'text-anchor'",
+          "object": "LayoutSVGText text",
           "rect": [519, 12, 130, 36],
-          "reason": "selection"
+          "reason": "appeared"
         },
         {
           "object": "LayoutSVGText text",
-          "rect": [519, 12, 130, 36],
+          "rect": [186, 12, 130, 36],
           "reason": "appeared"
         },
         {
           "object": "InlineTextBox 'text-anchor'",
-          "rect": [186, 12, 130, 36],
+          "rect": [519, 12, 129, 36],
           "reason": "selection"
         },
         {
-          "object": "LayoutSVGText text",
-          "rect": [186, 12, 130, 36],
-          "reason": "appeared"
+          "object": "InlineTextBox 'text-anchor'",
+          "rect": [352, 12, 129, 36],
+          "reason": "selection"
+        },
+        {
+          "object": "InlineTextBox 'text-anchor'",
+          "rect": [186, 12, 128, 36],
+          "reason": "selection"
         },
         {
           "object": "InlineTextBox '1'",

third_party/WebKit/Source/core/layout/api/LineLayoutItem.h

@@ -294,6 +294,9 @@ class LineLayoutItem {
   }
 
   LayoutRect VisualRect() const { return layout_object_->VisualRect(); }
+  LayoutRect PartialInvalidationRect() const {
+    return layout_object_->PartialInvalidationRect();
+  }
 
   bool IsHashTableDeletedValue() const {
     return layout_object_ == kHashTableDeletedValue;

third_party/WebKit/Source/core/layout/line/InlineBox.cpp

@@ -95,10 +95,15 @@ String InlineBox::DebugName() const {
 }
 
 LayoutRect InlineBox::VisualRect() const {
-  // TODO(chrishtr): tighten these bounds.
+  // TODO(wangxianzhu): tighten it.
   return GetLineLayoutItem().VisualRect();
 }
 
+LayoutRect InlineBox::PartialInvalidationRect() const {
+  // TODO(wangxianzhu): tighten it.
+  return GetLineLayoutItem().PartialInvalidationRect();
+}
+
 #ifndef NDEBUG
 void InlineBox::ShowTreeForThis() const {
   GetLineLayoutItem().ShowTreeForThis();

third_party/WebKit/Source/core/layout/line/InlineBox.h

@@ -138,6 +138,7 @@ class CORE_EXPORT InlineBox : public DisplayItemClient {
   // DisplayItemClient methods
   String DebugName() const override;
   LayoutRect VisualRect() const override;
+  LayoutRect PartialInvalidationRect() const override;
 
   bool IsText() const { return bitfields_.IsText(); }
   void SetIsText(bool is_text) { bitfields_.SetIsText(is_text); }

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

@@ -536,16 +536,20 @@ void ObjectPaintInvalidatorWithContext::InvalidateSelection(
 
   object_.GetMutableForPainting().SetSelectionVisualRect(new_selection_rect);
 
-  if (!full_invalidation) {
-    // TODO(crbug.com/732612): Implement partial raster invalidation for
-    // selection.
-    if (!RuntimeEnabledFeatures::SlimmingPaintV175Enabled()) {
-      FullyInvalidatePaint(PaintInvalidationReason::kSelection,
-                           old_selection_rect, new_selection_rect);
-    }
-    context_.painting_layer->SetNeedsRepaint();
-    object_.InvalidateDisplayItemClients(PaintInvalidationReason::kSelection);
+  if (full_invalidation)
+    return;
+
+  if (RuntimeEnabledFeatures::SlimmingPaintV175Enabled()) {
+    // PaintController will handle raster invalidation of the partial rect.
+    object_.GetMutableForPainting().SetPartialInvalidationRect(
+        UnionRect(object_.PartialInvalidationRect(),
+                  UnionRect(new_selection_rect, old_selection_rect)));
+  } else {
+    FullyInvalidatePaint(PaintInvalidationReason::kSelection,
+                         old_selection_rect, new_selection_rect);
   }
+  context_.painting_layer->SetNeedsRepaint();
+  object_.InvalidateDisplayItemClients(PaintInvalidationReason::kSelection);
 }
 
 DISABLE_CFI_PERF
@@ -558,11 +562,6 @@ void ObjectPaintInvalidatorWithContext::InvalidatePartialRect(
   if (rect.IsEmpty())
     return;
 
-  if (reason == PaintInvalidationReason::kNone) {
-    context_.painting_layer->SetNeedsRepaint();
-    object_.InvalidateDisplayItemClients(PaintInvalidationReason::kRectangle);
-  }
-
   context_.MapLocalRectToVisualRectInBacking(object_, rect);
   if (rect.IsEmpty())
     return;
@@ -574,6 +573,9 @@ void ObjectPaintInvalidatorWithContext::InvalidatePartialRect(
     InvalidatePaintRectangleWithContext(rect,
                                         PaintInvalidationReason::kRectangle);
   }
+
+  context_.painting_layer->SetNeedsRepaint();
+  object_.InvalidateDisplayItemClients(PaintInvalidationReason::kRectangle);
 }
 
 DISABLE_CFI_PERF
@@ -583,13 +585,15 @@ ObjectPaintInvalidatorWithContext::InvalidatePaintWithComputedReason(
   DCHECK(!(context_.subtree_flags &
            PaintInvalidatorContext::kSubtreeNoInvalidation));
 
+  // This is before InvalidateSelection before the latter will accumulate
+  // selection visual rects to the partial rect mapped in the former.
+  InvalidatePartialRect(reason);
+
   // We need to invalidate the selection before checking for whether we are
   // doing a full invalidation.  This is because we need to update the previous
   // selection rect regardless.
   InvalidateSelection(reason);
 
-  InvalidatePartialRect(reason);
-
   switch (reason) {
     case PaintInvalidationReason::kNone:
       // There are corner cases that the display items need to be invalidated

third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp

@@ -910,10 +910,10 @@ void PaintController::GenerateRasterInvalidation(
     return;
   }
 
-  if (client.GetPaintInvalidationReason() !=
-          PaintInvalidationReason::kRectangle &&
-      client.GetPaintInvalidationReason() !=
-          PaintInvalidationReason::kIncremental) {
+  auto reason = client.GetPaintInvalidationReason();
+  if (reason != PaintInvalidationReason::kRectangle &&
+      reason != PaintInvalidationReason::kSelection &&
+      reason != PaintInvalidationReason::kIncremental) {
     GenerateFullRasterInvalidation(chunk, *old_item, *new_item);
     return;
   }
@@ -921,10 +921,8 @@ void PaintController::GenerateRasterInvalidation(
   GenerateIncrementalRasterInvalidation(chunk, *old_item, *new_item);
 
   auto partial_rect = client.PartialInvalidationRect();
-  if (!partial_rect.IsEmpty()) {
-    AddRasterInvalidation(client, chunk, FloatRect(partial_rect),
-                          PaintInvalidationReason::kRectangle);
-  }
+  if (!partial_rect.IsEmpty())
+    AddRasterInvalidation(client, chunk, FloatRect(partial_rect), reason);
 }
 
 static FloatRect ComputeRightDelta(const FloatPoint& location,