Invalidate caret during paint invalidation

third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidate-caret-in-composited-scrolling-container-expected.txt

Index: third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidate-caret-in-composited-scrolling-container-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidate-caret-in-composited-scrolling-container-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidate-caret-in-composited-scrolling-container-expected.txt
index 745f58c75a97a04246163a633538e7122f5e6a57..3603a6a5a96c5ed9382fc3934c012d0ab4abf598 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidate-caret-in-composited-scrolling-container-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidate-caret-in-composited-scrolling-container-expected.txt
@@ -30,7 +30,14 @@
       "position": [3, 4],
       "bounds": [60, 16],
       "shouldFlattenTransform": false,
-      "drawsContent": true
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [57, -1, 3, 18],
+          "reason": "caret"
+        }
+      ]
     },
     {
       "name": "Scrolling Layer",
@@ -41,11 +48,102 @@
       "name": "Scrolling Contents Layer",
       "bounds": [75, 16],
       "drawsContent": true,
-      "paintInvalidations": [
+      "underPaintInvalidations": [

[chrishtr, 2017/01/31 22:51:03]

Under-invalidations?

[Xianzhu, 2017/02/02 23:42:06]

Oops. Wondering why I overlooked this. We should always invalidate caret on the
scrolling layer. Fixed.

+        {
+          "x": 73,
+          "y": 0,
+          "oldPixel": "#00000000",
+          "newPixel": "#000000"
+        },
+        {
+          "x": 73,
+          "y": 1,
+          "oldPixel": "#00000000",
+          "newPixel": "#000000"
+        },
+        {
+          "x": 73,
+          "y": 2,
+          "oldPixel": "#00000000",
+          "newPixel": "#000000"
+        },
+        {
+          "x": 73,
+          "y": 3,
+          "oldPixel": "#00000000",
+          "newPixel": "#000000"
+        },
+        {
+          "x": 73,
+          "y": 4,
+          "oldPixel": "#00000000",
+          "newPixel": "#000000"
+        },
+        {
+          "x": 73,
+          "y": 5,
+          "oldPixel": "#00000000",
+          "newPixel": "#000000"
+        },
+        {
+          "x": 73,
+          "y": 6,
+          "oldPixel": "#00000000",
+          "newPixel": "#000000"
+        },
+        {
+          "x": 73,
+          "y": 7,
+          "oldPixel": "#00000000",
+          "newPixel": "#000000"
+        },
+        {
+          "x": 73,
+          "y": 8,
+          "oldPixel": "#00000000",
+          "newPixel": "#000000"
+        },
+        {
+          "x": 73,
+          "y": 9,
+          "oldPixel": "#00000000",
+          "newPixel": "#000000"
+        },
+        {
+          "x": 73,
+          "y": 10,
+          "oldPixel": "#00000000",
+          "newPixel": "#000000"
+        },
+        {
+          "x": 73,
+          "y": 11,
+          "oldPixel": "#00000000",
+          "newPixel": "#000000"
+        },
+        {
+          "x": 73,
+          "y": 12,
+          "oldPixel": "#00000000",
+          "newPixel": "#000000"
+        },
         {
-          "object": "LayoutText #text",
-          "rect": [72, -1, 3, 18],
-          "reason": "invalidate paint rectangle"
+          "x": 73,
+          "y": 13,
+          "oldPixel": "#00000000",
+          "newPixel": "#000000"
+        },
+        {
+          "x": 73,
+          "y": 14,
+          "oldPixel": "#00000000",
+          "newPixel": "#000000"
+        },
+        {
+          "x": 73,
+          "y": 15,
+          "oldPixel": "#00000000",
+          "newPixel": "#000000"
         }
       ]
     },
@@ -62,12 +160,16 @@
   ],
   "objectPaintInvalidations": [
     {
+      "object": "LayoutTextControl INPUT id='root'",
+      "reason": "subtree"
+    },
+    {
       "object": "Caret",
-      "reason": "invalidate paint rectangle"
+      "reason": "caret"
     },
     {
-      "object": "LayoutTextControl INPUT id='root'",
-      "reason": "subtree"
+      "object": "Caret",
+      "reason": "caret"
     }
   ]
 }