Fix paint invalidation of paintInvalidationContainer itself

third_party/WebKit/Source/core/layout/LayoutObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1620 matching lines @@
 {
     ASSERT_NOT_REACHED();
     return LayoutRect();
 }
 
 void LayoutObject::mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect& rect, const PaintInvalidationState* paintInvalidationState) const
 {
     if (ancestor == this)
         return;
 
-    if (paintInvalidationState && paintInvalidationState->canMapToContainer(ancestor)) {
-        rect.move(paintInvalidationState->paintOffset());
-        if (paintInvalidationState->isClipped())
-            rect.intersect(paintInvalidationState->clipRect());
+    if (paintInvalidationState && paintInvalidationState->canMapToAncestor(ancestor)) {
+        paintInvalidationState->mapObjectRectToAncestor(*this, ancestor, rect);
         return;
     }
 
     if (LayoutObject* parent = this->parent()) {
         if (parent->hasOverflowClip()) {
             LayoutBox* parentBox = toLayoutBox(parent);
             parentBox->mapScrollingContentsRectToBoxSpace(rect);
             if (parent != ancestor)
                 parentBox->applyOverflowClip(rect);
             if (rect.isEmpty())
@@ skipping 573 matching lines @@
     mapAncestorToLocal(ancestor, transformState, mode);
     transformState.flatten();
     return transformState.lastPlanarQuad();
 }
 
 void LayoutObject::mapLocalToAncestor(const LayoutBoxModelObject* ancestor, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed, const PaintInvalidationState* paintInvalidationState) const
 {
     if (ancestor == this)
         return;
 
-    if (paintInvalidationState && paintInvalidationState->canMapToContainer(ancestor)) {
+    if (paintInvalidationState && paintInvalidationState->canMapToAncestor(ancestor)) {
         LayoutSize offset = paintInvalidationState->paintOffset();
         if (const LayoutBox* layoutBox = isBox() ? toLayoutBox(this) : nullptr)
             offset += layoutBox->locationOffset();
         if (const PaintLayer* layer = style()->hasInFlowPosition() && hasLayer() ? toLayoutBoxModelObject(this)->layer() : nullptr)
             offset += layer->offsetForInFlowPosition();
         transformState.move(offset);
         return;
     }
 
     if (wasFixed)
@@ skipping 1479 matching lines @@
         const blink::LayoutObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
     } else {
         fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n");
     }
 }
 
 #endif