Fix wrong display item type for drag caret

The bug seems to have been there since we added DisplayItem::kCaret. This breaks under-invalidation checking itself only. It won't cause any visible issue to release builds, except small performance penalty that the drag caret is always repainted because of no match in the cache with the wrong id. BUG=699480 Review-Url: https://codereview.chromium.org/2742693002 Cr-Commit-Position: refs/heads/master@{#455778}

Fix wrong display item type for drag caret
The bug seems to have been there since we added DisplayItem::kCaret. This breaks under-invalidation checking itself only. It won't cause any visible issue to release builds, except small performance penalty that the drag caret is always repainted because of no match in the cache with the wrong id. BUG=699480 Review-Url: https://codereview.chromium.org/2742693002 Cr-Commit-Position: refs/heads/master@{#455778}
b3ea2018 · wangxianzhu · Commit bot · 136423e8 · b3ea2018 · b3ea2018
Commit b3ea2018 authored Mar 09, 2017 by wangxianzhu Committed by Commit bot Mar 09, 2017
2 changed files
--- a/third_party/WebKit/LayoutTests/paint/selection/drag-caret.html
+++ b/third_party/WebKit/LayoutTests/paint/selection/drag-caret.html
+<!DOCTYPE html>
+Passes if no crash.
+<input id="fileinput" type="file">
+<script src="../../resources/run-after-layout-and-paint.js"></script>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script>
+if (window.testRunner && window.eventSender) {
+  internals.runtimeFlags.paintUnderInvalidationCheckingEnabled = true;
+  document.designMode="on";
+  async_test(t => {
+    runAfterLayoutAndPaint(t.step_func_done(() => {
+      eventSender.beginDragWithFiles(['testpath1/testfile1.txt']);
+      var centerX = fileinput.offsetLeft + fileinput.offsetWidth / 2;
+      var centerY = fileinput.offsetTop + fileinput.offsetHeight / 2;
+      eventSender.mouseMoveTo(centerX, centerY);
+      eventSender.mouseUp();
+    }));
+  });
+}
+</script>
--- a/third_party/WebKit/Source/core/editing/CaretDisplayItemClient.cpp
+++ b/third_party/WebKit/Source/core/editing/CaretDisplayItemClient.cpp
@@ -260,8 +260,7 @@ void CaretDisplayItemClient::paintCaret(
  drawingRect.moveBy(paintOffset);

  IntRect paintRect = pixelSnappedIntRect(drawingRect);
-  DrawingRecorder drawingRecorder(context, *this, DisplayItem::kCaret,
-                                  paintRect);
+  DrawingRecorder drawingRecorder(context, *this, displayItemType, paintRect);
  context.fillRect(paintRect, m_color);
 }