Cherry-pick r415013 to M53.

third_party/WebKit/Source/core/editing/FrameCaret.cpp

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 190 matching lines @@
 
     updateAppearance();
 }
 
 void FrameCaret::paintCaret(GraphicsContext& context, const LayoutPoint& paintOffset)
 {
     if (!(isActive() && m_shouldPaintCaret))
         return;
 
     updateCaretRect(m_caretPosition);
-    CaretBase::paintCaret(m_caretPosition.position().anchorNode(), context, paintOffset);
+    CaretBase::paintCaret(m_caretPosition.position().anchorNode(), context, paintOffset, DisplayItem::Caret);
 }
 
 void FrameCaret::dataWillChange(const CharacterData& node)
 {
     if (node == m_previousCaretNode) {
         // This invalidation is eager, and intentionally uses stale state.
         DisableCompositingQueryAsserts disabler;
         invalidateLocalCaretRect(m_previousCaretNode.get(), m_previousCaretRect);
     }
 }
@@ skipping 39 matching lines @@
 void FrameCaret::caretBlinkTimerFired(Timer<FrameCaret>*)
 {
     DCHECK(caretIsVisible());
     if (isCaretBlinkingSuspended() && m_shouldPaintCaret)
         return;
     m_shouldPaintCaret = !m_shouldPaintCaret;
     setCaretRectNeedsUpdate();
 }
 
 } // nemaspace blink