Delete an assortment of unneeded paint invalidation code.

sky/engine/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 65 matching lines @@
 {
     return !frame || frame->editor().behavior().shouldConsiderSelectionAsDirectional();
 }
 
 FrameSelection::FrameSelection(LocalFrame* frame)
     : m_frame(frame)
     , m_xPosForVerticalArrowNavigation(NoXPosForVerticalArrowNavigation())
     , m_observingVisibleSelection(false)
     , m_granularity(CharacterGranularity)
     , m_caretBlinkTimer(this, &FrameSelection::caretBlinkTimerFired)
-    , m_caretRectDirty(true)
     , m_shouldPaintCaret(true)
     , m_isCaretBlinkingSuspended(false)
     , m_focused(frame && frame->page() && frame->page()->focusController().focusedFrame() == frame)
     , m_shouldShowBlockCursor(false)
 {
     if (shouldAlwaysUseDirectionalSelection(m_frame))
         m_selection.setIsDirectional(true);
 }
 
 FrameSelection::~FrameSelection()
@@ skipping 1052 matching lines @@
 {
     m_granularity = CharacterGranularity;
 
     m_caretBlinkTimer.stop();
 
     RenderView* view = m_frame->contentRenderer();
     if (view)
         view->clearSelection();
 
     setSelection(VisibleSelection(), CloseTyping | ClearTypingStyle | DoNotUpdateAppearance);
-    m_previousCaretNode.clear();
 }
 
 void FrameSelection::setStart(const VisiblePosition &pos, EUserTriggered trigger)
 {
     if (m_selection.isBaseFirst())
         setBase(pos, trigger);
     else
         setExtent(pos, trigger);
 }
 
@@ skipping 32 matching lines @@
     ASSERT(m_frame->document()->lifecycle().state() != DocumentLifecycle::InPaintInvalidation);
     m_frame->document()->updateLayout();
     if (!isNonOrphanedCaret(m_selection)) {
         clearCaretRect();
     } else {
         updateCaretRect(m_frame->document(), VisiblePosition(m_selection.start(), m_selection.affinity()));
     }
     return absoluteBoundsForLocalRect(m_selection.start().deprecatedNode(), localCaretRectWithoutUpdate());
 }
 
-static LayoutRect localCaretRect(const VisibleSelection& m_selection, const PositionWithAffinity& caretPosition, RenderObject*& renderer)
-{
-    renderer = nullptr;
-    if (!isNonOrphanedCaret(m_selection))
-        return LayoutRect();
-
-    return localCaretRectOfPosition(caretPosition, renderer);
-}
-
-void FrameSelection::invalidateCaretRect()
-{
-    if (!m_caretRectDirty)
-        return;
-    m_caretRectDirty = false;
-
-    RenderObject* renderer = nullptr;
-    LayoutRect newRect = localCaretRect(m_selection, PositionWithAffinity(m_selection.start(), m_selection.affinity()), renderer);
-    Node* newNode = renderer ? renderer->node() : nullptr;
-
-    if (!m_caretBlinkTimer.isActive() && newNode == m_previousCaretNode && newRect == m_previousCaretRect)
-        return;
-
-    if (m_previousCaretNode && m_previousCaretNode->isContentEditable())
-        invalidateLocalCaretRect(m_previousCaretNode.get(), m_previousCaretRect);
-    if (newNode && newNode->isContentEditable())
-        invalidateLocalCaretRect(newNode, newRect);
-
-    m_previousCaretNode = newNode;
-    m_previousCaretRect = newRect;
-}
-
 void FrameSelection::paintCaret(GraphicsContext* context, const LayoutPoint& paintOffset, const LayoutRect& clipRect)
 {
     if (m_selection.isCaret() && m_shouldPaintCaret) {
         updateCaretRect(m_frame->document(), PositionWithAffinity(m_selection.start(), m_selection.affinity()));
         CaretBase::paintCaret(m_selection.start().deprecatedNode(), context, paintOffset, clipRect);
     }
 }
 
 bool FrameSelection::contains(const LayoutPoint& point)
 {
@@ skipping 428 matching lines @@
 
 void FrameSelection::showTreeForThis() const
 {
     m_selection.showTreeForThis();
 }
 
 #endif
 
 void FrameSelection::setCaretRectNeedsUpdate()
 {
-    m_caretRectDirty = true;
-
     scheduleVisualUpdate();
 }
 
 void FrameSelection::scheduleVisualUpdate() const
 {
     if (!m_frame)
         return;
     if (Page* page = m_frame->page())
         page->animator().scheduleVisualUpdate();
 }
 
 }
 
 #ifndef NDEBUG
 
 void showTree(const blink::FrameSelection& sel)
 {
     sel.showTreeForThis();
 }
 
 void showTree(const blink::FrameSelection* sel)
 {
     if (sel)
         sel->showTreeForThis();
 }
 
 #endif