Fix paint invalidation and painting for composited-scrolling input elements.

third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/ObjectPaintInvalidator.h"
 
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/layout/LayoutBlockFlow.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
@@ skipping 206 matching lines @@
     DCHECK(paintInvalidationContainer.compositingState() != NotComposited);
 
     PaintLayer& layer = *paintInvalidationContainer.layer();
     if (layer.groupedMapping()) {
         if (GraphicsLayer* squashingLayer = layer.groupedMapping()->squashingLayer()) {
             // Note: the subpixel accumulation of layer() does not need to be added here. It is already taken into account.
             squashingLayer->setNeedsDisplayInRect(enclosingIntRect(rect), reason, m_object);
         }
     } else if (m_object.compositedScrollsWithRespectTo(paintInvalidationContainer)) {
         layer.compositedLayerMapping()->setScrollingContentsNeedDisplayInRect(rect, reason, m_object);
-    } else if (paintInvalidationContainer.usesCompositedScrolling()) {
+    } else if (paintInvalidationContainer.usesCompositedScrolling() && reason != PaintInvalidationRectangle) {
         if (layer.compositedLayerMapping()->shouldPaintBackgroundOntoScrollingContentsLayer()) {
             // TODO(flackr): Get a correct rect in the context of the scrolling contents layer to update
             // rather than updating the entire rect.
             const LayoutRect& scrollingContentsRect = toLayoutBox(m_object).layoutOverflowRect();
             layer.compositedLayerMapping()->setScrollingContentsNeedDisplayInRect(scrollingContentsRect, reason, m_object);
             layer.setNeedsRepaint();
             invalidateDisplayItemClient(*layer.compositedLayerMapping()->scrollingContentsLayer(), reason);
         }
         layer.compositedLayerMapping()->setNonScrollingContentsNeedDisplayInRect(rect, reason, m_object);
     } else {
@@ skipping 29 matching lines @@
 
     // This conditional handles situations where non-rooted (and hence non-composited) frames are
     // painted, such as SVG images.
     if (!paintInvalidationContainer.isPaintInvalidationContainer())
         invalidatePaintRectangleOnWindow(paintInvalidationContainer, enclosingIntRect(dirtyRect));
 
     if (paintInvalidationContainer.view()->usesCompositing() && paintInvalidationContainer.isPaintInvalidationContainer())
         setBackingNeedsPaintInvalidationInRect(paintInvalidationContainer, dirtyRect, invalidationReason);
 }
 
-void ObjectPaintInvalidator::invalidatePaintRectangle(const LayoutRect& dirtyRect)
+void ObjectPaintInvalidator::invalidatePaintRectangle(const LayoutRect& dirtyRect, DisplayItemClient* displayItemClient)
 {
     CHECK(m_object.isRooted());
 
     if (dirtyRect.isEmpty())
         return;
 
     if (m_object.view()->document().printing())
         return; // Don't invalidate paints if we're printing.
 
     const LayoutBoxModelObject& paintInvalidationContainer = m_object.containerForPaintInvalidation();
     LayoutRect dirtyRectOnBacking = dirtyRect;
     PaintLayer::mapRectToPaintInvalidationBacking(m_object, paintInvalidationContainer, dirtyRectOnBacking);
     dirtyRectOnBacking.move(m_object.scrollAdjustmentForPaintInvalidation(paintInvalidationContainer));
 
     invalidatePaintUsingContainer(paintInvalidationContainer, dirtyRectOnBacking, PaintInvalidationRectangle);
 
     slowSetPaintingLayerNeedsRepaint();
-    m_object.invalidateDisplayItemClients(PaintInvalidationRectangle);
+    if (displayItemClient)
+        invalidateDisplayItemClient(*displayItemClient, PaintInvalidationRectangle);
+    else
+        m_object.invalidateDisplayItemClients(PaintInvalidationRectangle);
 }
 
 void ObjectPaintInvalidator::slowSetPaintingLayerNeedsRepaint()
 {
     if (PaintLayer* paintingLayer = m_object.paintingLayer())
         paintingLayer->setNeedsRepaint();
 }
 
 bool ObjectPaintInvalidatorWithContext::incrementallyInvalidatePaint()
 {
@@ skipping 161 matching lines @@
     m_object.invalidateDisplayItemClients(reason);
     return reason;
 }
 
 DisablePaintInvalidationStateAsserts::DisablePaintInvalidationStateAsserts()
     : m_disabler(&gDisablePaintInvalidationStateAsserts, true)
 {
 }
 
 } // namespace blink