Fix LayoutObject::mapToVisibleRectInContainerSpace()

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 1351 matching lines @@
     bool fullInvalidation = view()->doingFullPaintInvalidation() || isFullPaintInvalidationReason(invalidationReason);
     if (!fullInvalidation && !shouldInvalidateSelection())
         return;
 
     LayoutRect oldSelectionRect = previousSelectionRectForPaintInvalidation();
     LayoutRect newSelectionRect = selectionRectForPaintInvalidation(&paintInvalidationContainer);
 
     // Composited scrolling should not be included in the bounds and position tracking, because the graphics layer backing the scroller
     // does not move on scroll.
     if (paintInvalidationContainer.usesCompositedScrolling() && &paintInvalidationContainer != this) {
-        LayoutSize inverseOffset(toLayoutBox(&paintInvalidationContainer)->scrolledContentOffset());
+        LayoutSize inverseOffset= LayoutSize(toLayoutBox(&paintInvalidationContainer)->scrolledContentOffset());
         newSelectionRect.move(inverseOffset);
     }
 
     setPreviousSelectionRectForPaintInvalidation(newSelectionRect);
 
     if (shouldInvalidateSelection())
         invalidateDisplayItemClients(paintInvalidationContainer, PaintInvalidationSelection, nullptr);
 
     if (fullInvalidation)
         return;
@@ skipping 211 matching lines @@
         return;
 
     if (paintInvalidationState && paintInvalidationState->canMapToContainer(paintInvalidationContainer)) {
         rect.move(paintInvalidationState->paintOffset());
         if (paintInvalidationState->isClipped())
             rect.intersect(paintInvalidationState->clipRect());
         return;
     }
 
     if (LayoutObject* o = parent()) {
-        if (o != paintInvalidationContainer && o->hasOverflowClip()) {
-            LayoutBox* boxParent = toLayoutBox(o);
-            if (o == paintInvalidationContainer)
-                boxParent->applyCachedScrollOffsetForPaintInvalidation(rect);
-            else
-                boxParent->applyCachedClipAndScrollOffsetForPaintInvalidation(rect);
+        if (o->hasOverflowClip()) {
+            toLayoutBox(o)->applyOverflowClipAndScrollOffsetForPaintInvalidationIfNeeded(rect);
             if (rect.isEmpty())
                 return;
         }
-
         o->mapToVisibleRectInContainerSpace(paintInvalidationContainer, rect, paintInvalidationState);
     }
 }
 
 void LayoutObject::dirtyLinesFromChangedChild(LayoutObject*)
 {
 }
 
 #ifndef NDEBUG
 
@@ skipping 1898 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