Move clearPaintInvalidatinFlags after subtree walk

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google 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
@@ skipping 485 matching lines @@
 
   if (mayNeedPaintInvalidationSubtree())
     newPaintInvalidationState
         .setForceSubtreeInvalidationCheckingWithinContainer();
 
   ObjectPaintInvalidator paintInvalidator(*this);
   LayoutRect previousVisualRect = this->previousVisualRect();
   LayoutPoint previousLocation = paintInvalidator.previousLocationInBacking();
   PaintInvalidationReason reason =
       invalidatePaintIfNeeded(newPaintInvalidationState);
-  clearPaintInvalidationFlags();
 
   if (previousLocation != paintInvalidator.previousLocationInBacking()) {
     newPaintInvalidationState
         .setForceSubtreeInvalidationCheckingWithinContainer();
   }
 
   // TODO(wangxianzhu): Combine this function into LayoutObject::
   // invalidateTreeIfNeeded() when removing the following workarounds.
 
   // TODO(wangxianzhu): This is a workaround for crbug.com/533277. Will remove
@@ skipping 11 matching lines @@
       !usesCompositedScrolling()
       // Note that isLayoutView() below becomes unnecessary after the launch of
       // root layer scrolling.
       && (hasOverflowClip() || isLayoutView())) {
     newPaintInvalidationState
         .setForceSubtreeInvalidationRectUpdateWithinContainer();
   }
 
   newPaintInvalidationState.updateForChildren(reason);
   invalidatePaintOfSubtreesIfNeeded(newPaintInvalidationState);
+
+  clearPaintInvalidationFlags();
 }
 
 void LayoutBoxModelObject::addOutlineRectsForNormalChildren(
     Vector<LayoutRect>& rects,
     const LayoutPoint& additionalOffset,
     IncludeBlockVisualOverflowOrNot includeBlockOverflows) const {
   for (LayoutObject* child = slowFirstChild(); child;
        child = child->nextSibling()) {
     // Outlines of out-of-flow positioned descendants are handled in
     // LayoutBlock::addOutlineRects().
@@ skipping 792 matching lines @@
   if (rootElementStyle->hasBackground())
     return false;
 
   if (node() != document().firstBodyElement())
     return false;
 
   return true;
 }
 
 }  // namespace blink