Merge 139282

Source/WebCore/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 1201 matching lines @@
 {
     const bool selectionHasDirection = true;
     setSelection(VisibleSelection(m_selection.base(), pos, affinity, selectionHasDirection), CloseTyping | ClearTypingStyle | userTriggered);
 }
 
 void CaretBase::clearCaretRect()
 {
     m_caretLocalRect = LayoutRect();
 }
 
+static inline bool caretRendersInsideNode(Node* node)
+{
+    return node && !isTableElement(node) && !editingIgnoresContent(node);
+}
+
+static RenderObject* caretRenderer(Node* node)
+{
+    if (!node)
+        return 0;
+
+    RenderObject* renderer = node->renderer();
+    if (!renderer)
+        return 0;
+
+    // if caretNode is a block and caret is inside it then caret should be painted by that block
+    bool paintedByBlock = renderer->isBlockFlow() && caretRendersInsideNode(node);
+    return paintedByBlock ? renderer : renderer->containingBlock();
+}
+
 bool CaretBase::updateCaretRect(Document* document, const VisiblePosition& caretPosition)
 {
     document->updateStyleIfNeeded();
     m_caretLocalRect = LayoutRect();
 
     m_caretRectNeedsUpdate = false;
 
     if (caretPosition.isNull())
         return false;
 
@@ skipping 18 matching lines @@
         localRect.move(renderer->offsetFromContainer(containerObject, localRect.location()));
         renderer = containerObject;
     }
 
     if (!unrooted)
         m_caretLocalRect = localRect;
 
     return true;
 }
 
-static inline bool caretRendersInsideNode(Node* node)
-{
-    return node && !isTableElement(node) && !editingIgnoresContent(node);
-}
-
-RenderObject* CaretBase::caretRenderer(Node* node) const
-{
-    if (!node)
-        return 0;
-
-    RenderObject* renderer = node->renderer();
-    if (!renderer)
-        return 0;
-
-    // if caretNode is a block and caret is inside it then caret should be painted by that block
-    bool paintedByBlock = renderer->isBlockFlow() && caretRendersInsideNode(node);
-    return paintedByBlock ? renderer : renderer->containingBlock();
-}
-
 RenderObject* FrameSelection::caretRenderer() const
 {
-    return CaretBase::caretRenderer(m_selection.start().deprecatedNode());
+    return WebCore::caretRenderer(m_selection.start().deprecatedNode());
 }
 
 RenderObject* DragCaretController::caretRenderer() const
 {
-    return CaretBase::caretRenderer(m_position.deepEquivalent().deprecatedNode());
+    return WebCore::caretRenderer(m_position.deepEquivalent().deprecatedNode());
 }
 
 static bool isNonOrphanedCaret(const VisibleSelection& selection)
 {
     return selection.isCaret() && !selection.start().isOrphan() && !selection.end().isOrphan();
 }
 
 LayoutRect FrameSelection::localCaretRect()
 {
     if (shouldUpdateCaretRect()) {
@@ skipping 17 matching lines @@
         toRenderBox(caretPainter)->flipForWritingMode(localRect);
     return caretPainter->localToAbsoluteQuad(FloatRect(localRect)).enclosingBoundingBox();
 }
 
 IntRect FrameSelection::absoluteCaretBounds()
 {
     recomputeCaretRect();
     return m_absCaretBounds;
 }
 
-static LayoutRect repaintRectForCaret(LayoutRect caret)
+static void repaintCaretForLocalRect(Node* node, const LayoutRect& rect)
 {
-    if (caret.isEmpty())
-        return LayoutRect();
-    // Ensure that the dirty rect intersects the block that paints the caret even in the case where
-    // the caret itself is just outside the block. See <https://bugs.webkit.org/show_bug.cgi?id=19086>.
-    caret.inflateX(1);
-    caret.inflateY(1);
-    return caret;
-}
+    RenderObject* caretPainter = caretRenderer(node);
+    if (!caretPainter)
+        return;
 
-IntRect CaretBase::caretRepaintRect(Node* node) const
-{
-    return absoluteBoundsForLocalRect(node, repaintRectForCaret(localCaretRectWithoutUpdate()));
+    caretPainter->repaintRectangle(rect);
 }
 
 bool FrameSelection::recomputeCaretRect()
 {
     if (!shouldUpdateCaretRect())
         return false;
 
     if (!m_frame)
         return false;
 
     FrameView* v = m_frame->document()->view();
     if (!v)
         return false;
 
     LayoutRect oldRect = localCaretRectWithoutUpdate();
     LayoutRect newRect = localCaretRect();
     if (oldRect == newRect && !m_absCaretBoundsDirty)
         return false;
 
     IntRect oldAbsCaretBounds = m_absCaretBounds;
-    // FIXME: Rename m_caretRect to m_localCaretRect.
     m_absCaretBounds = absoluteBoundsForLocalRect(m_selection.start().deprecatedNode(), localCaretRectWithoutUpdate());
     m_absCaretBoundsDirty = false;
     
     if (oldAbsCaretBounds == m_absCaretBounds)
         return false;
 
 #if ENABLE(TEXT_CARET)
-    IntRect oldAbsoluteCaretRepaintBounds = m_absoluteCaretRepaintBounds;
-#endif
-
-    // We believe that we need to inflate the local rect before transforming it to obtain the repaint bounds.
-    m_absoluteCaretRepaintBounds = caretRepaintRect(m_selection.start().deprecatedNode());
-
-#if ENABLE(TEXT_CARET)
     if (RenderView* view = m_frame->document()->renderView()) {
-        // FIXME: make caret repainting container-aware.
-        view->repaintRectangleInViewAndCompositedLayers(oldAbsoluteCaretRepaintBounds, false);
+        Node* node = m_selection.start().deprecatedNode();
+        if (m_previousCaretNode)
+            repaintCaretForLocalRect(m_previousCaretNode.get(), oldRect);
+        m_previousCaretNode = node;
         if (shouldRepaintCaret(view, isContentEditable()))
-            view->repaintRectangleInViewAndCompositedLayers(m_absoluteCaretRepaintBounds, false);
+            repaintCaretForLocalRect(node, newRect);
     }
 #endif
     return true;
 }
 
 bool CaretBase::shouldRepaintCaret(const RenderView* view, bool isContentEditable) const
 {
     ASSERT(view);
     Frame* frame = view->frameView() ? view->frameView()->frame() : 0; // The frame where the selection started.
     bool caretBrowsing = frame && frame->settings() && frame->settings()->caretBrowsingEnabled();
@@ skipping 21 matching lines @@
     // changes which may have been done.
     // And, we need to leave this layout here so the caret moves right 
     // away after clicking.
     m_caretRectNeedsUpdate = true;
 
     if (caretRectChanged)
         return;
 
     if (RenderView* view = node->document()->renderView()) {
         if (shouldRepaintCaret(view, node->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable)))
-            view->repaintRectangleInViewAndCompositedLayers(caretRepaintRect(node), false);
+            repaintCaretForLocalRect(node, localCaretRectWithoutUpdate());
     }
 }
 
 void FrameSelection::paintCaret(GraphicsContext* context, const LayoutPoint& paintOffset, const LayoutRect& clipRect)
 {
     if (m_selection.isCaret() && m_caretPaint)
         CaretBase::paintCaret(m_selection.start().deprecatedNode(), context, paintOffset, clipRect);
 }
 
 void CaretBase::paintCaret(Node* node, GraphicsContext* context, const LayoutPoint& paintOffset, const LayoutRect& clipRect) const
@@ skipping 246 matching lines @@
 }
 
 void FrameSelection::focusedOrActiveStateChanged()
 {
     bool activeAndFocused = isFocusedAndActive();
 
     // Because RenderObject::selectionBackgroundColor() and
     // RenderObject::selectionForegroundColor() check if the frame is active,
     // we have to update places those colors were painted.
     if (RenderView* view = m_frame->document()->renderView())
-        view->repaintRectangleInViewAndCompositedLayers(enclosingIntRect(bounds()));
+        view->repaintSelection();
 
     // Caret appears in the active frame.
     if (activeAndFocused)
         setSelectionFromNone();
     setCaretVisibility(activeAndFocused ? Visible : Hidden);
 
     // Update for caps lock state
     m_frame->eventHandler()->capsLockStateMayHaveChanged();
 
     // Because StyleResolver::checkOneSelector() and
@@ skipping 380 matching lines @@
     sel.showTreeForThis();
 }
 
 void showTree(const WebCore::FrameSelection* sel)
 {
     if (sel)
         sel->showTreeForThis();
 }
 
 #endif