Expand FrameSeleciton::isCaret() to increase chances of hoisting update layout

third_party/WebKit/Source/core/editing/FrameSelection.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 462 matching lines @@
 void FrameSelection::invalidatePaintIfNeeded(
     const LayoutBlock& block,
     const PaintInvalidatorContext& context,
     PaintInvalidationReason reason) {
   m_frameCaret->invalidatePaintIfNeeded(block, context, reason);
 }
 
 bool FrameSelection::shouldPaintCaret(const LayoutBlock& block) const {
   DCHECK_GE(document().lifecycle().state(), DocumentLifecycle::LayoutClean);
   bool result = m_frameCaret->shouldPaintCaret(block);
-  DCHECK(!result || (isCaret() && hasEditableStyle()));
+  DCHECK(!result || (computeVisibleSelectionInDOMTreeDeprecated().isCaret() &&
+                     hasEditableStyle()));
   return result;
 }
 
 IntRect FrameSelection::absoluteCaretBounds() {
   DCHECK(computeVisibleSelectionInDOMTree().isValidFor(*m_frame->document()));
   return m_frameCaret->absoluteCaretBounds();
 }
 
 void FrameSelection::paintCaret(GraphicsContext& context,
                                 const LayoutPoint& paintOffset) {
@@ skipping 684 matching lines @@
 }
 
 void showTree(const blink::FrameSelection* sel) {
   if (sel)
     sel->showTreeForThis();
   else
     LOG(INFO) << "Cannot showTree for <null> FrameSelection.";
 }
 
 #endif