Move selection invalidation to the invalidation phase

Source/core/rendering/RenderSelectionInfo.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 37 matching lines @@
 
     RenderObject* object() const { return m_object.get(); }
 
 protected:
     RawPtrWillBeMember<RenderObject> m_object;
     RawPtrWillBeMember<const RenderLayerModelObject> m_paintInvalidationContainer;
     RenderObject::SelectionState m_state;
 };
 
 // This struct is used when the selection changes to cache the old and new state of the selection for each RenderObject.
 class RenderSelectionInfo final : public RenderSelectionInfoBase {

[Xianzhu, 2014/11/03 17:03:36]

Can we combine RenderSelectionInfoBase into RenderSelectionInfo?

[Julien - ping for review, 2014/11/03 17:29:20]

Yes, however I didn't want to burden this patch with this refactoring. Also I
would like to get rid of these classes altogether first instead of just changing
the class hierarchy. 

 public:
     RenderSelectionInfo(RenderObject* o)
         : RenderSelectionInfoBase(o)
     {
         if (m_paintInvalidationContainer && o->canUpdateSelectionOnRootLineBoxes()) {
             m_rect = o->selectionRectForPaintInvalidation(m_paintInvalidationContainer);
             // FIXME: groupedMapping() leaks the squashing abstraction. See RenderBlockSelectionInfo for more details.
             if (m_paintInvalidationContainer->layer()->groupedMapping())
                 RenderLayer::mapRectToPaintBackingCoordinates(m_paintInvalidationContainer, m_rect);
         } else {
             m_rect = LayoutRect();
         }
     }
 
-    void invalidatePaint()
-    {
-        m_object->invalidatePaintUsingContainer(m_paintInvalidationContainer, enclosingIntRect(m_rect), PaintInvalidationSelection);
-    }
-
     LayoutRect absoluteSelectionRect() const
     {
         if (!m_paintInvalidationContainer)
             return LayoutRect();
 
         FloatQuad absQuad = m_paintInvalidationContainer->localToAbsoluteQuad(FloatRect(m_rect));
         return absQuad.enclosingBoundingBox();
     }
 
-    bool hasChangedFrom(const RenderSelectionInfo& other) const
-    {
-        // There is no point in comparing selection info for different objects.
-        ASSERT(m_object == other.m_object);
-        ASSERT(m_paintInvalidationContainer == other.m_paintInvalidationContainer);
-
-        return m_state != other.m_state || m_rect != other.m_rect;
-    }
-
 private:
     LayoutRect m_rect; // relative to paint invalidation container
 };
 
-// This struct is used when the selection changes to cache the old and new state of the selection for each RenderBlock.
-class RenderBlockSelectionInfo final : public RenderSelectionInfoBase {
-public:
-    RenderBlockSelectionInfo(RenderBlock* b)
-        : RenderSelectionInfoBase(b)
-    {
-        if (m_paintInvalidationContainer && b->canUpdateSelectionOnRootLineBoxes())
-            m_rects = block()->selectionGapRectsForPaintInvalidation(m_paintInvalidationContainer);
-        else
-            m_rects = GapRects();
-    }
-
-    void invalidatePaint()
-    {
-        LayoutRect paintInvalidationRect = m_rects;
-        // FIXME: this is leaking the squashing abstraction. However, removing the groupedMapping() condiitional causes
-        // RenderBox::mapRectToPaintInvalidationBacking to get called, which makes rect adjustments even if you pass the same
-        // paintInvalidationContainer as the render object. Find out why it does that and fix.
-        if (m_paintInvalidationContainer && m_paintInvalidationContainer->layer()->groupedMapping())
-            RenderLayer::mapRectToPaintBackingCoordinates(m_paintInvalidationContainer, paintInvalidationRect);
-        m_object->invalidatePaintUsingContainer(m_paintInvalidationContainer, enclosingIntRect(paintInvalidationRect), PaintInvalidationSelection);
-    }
-
-    bool hasChangedFrom(const RenderBlockSelectionInfo& other) const
-    {
-        // There is no point in comparing selection info for different objects.
-        ASSERT(m_object == other.m_object);
-        ASSERT(m_paintInvalidationContainer == other.m_paintInvalidationContainer);
-
-        return m_state != other.m_state || m_rects != other.m_rects;
-    }
-
-private:
-    RenderBlock* block() const { return toRenderBlock(m_object); }
-
-    GapRects m_rects; // relative to paint invalidation container
-};
-
 } // namespace blink
 
 
 #endif // RenderSelectionInfo_h