Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(374)

Side by Side Diff: Source/core/rendering/RenderBox.cpp

Issue 408083002: Revert of Enforce clearing renderers' paint invalidation state (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1564 matching lines...) Expand 10 before | Expand all | Expand 10 after
1575 RenderObject::invalidateTreeIfNeeded(childTreeWalkState); 1575 RenderObject::invalidateTreeIfNeeded(childTreeWalkState);
1576 // For the next invalidatePaintIfNeeded. 1576 // For the next invalidatePaintIfNeeded.
1577 savePreviousBorderBoxSizeIfNeeded(); 1577 savePreviousBorderBoxSizeIfNeeded();
1578 return; 1578 return;
1579 } 1579 }
1580 1580
1581 if ((onlyNeededPositionedMovementLayout() && compositingState() != PaintsInt oOwnBacking) 1581 if ((onlyNeededPositionedMovementLayout() && compositingState() != PaintsInt oOwnBacking)
1582 || (shouldDoFullPaintInvalidationIfSelfPaintingLayer() 1582 || (shouldDoFullPaintInvalidationIfSelfPaintingLayer()
1583 && hasLayer() 1583 && hasLayer()
1584 && layer()->isSelfPaintingLayer())) { 1584 && layer()->isSelfPaintingLayer())) {
1585 setShouldDoFullPaintInvalidation(true, MarkOnlyThis); 1585 setShouldDoFullPaintInvalidation(true);
1586 } 1586 }
1587 1587
1588 if (!invalidatePaintIfNeeded(newPaintInvalidationContainer, oldPaintInvalida tionRect, oldPositionFromPaintInvalidationContainer, paintInvalidationState)) 1588 if (!invalidatePaintIfNeeded(newPaintInvalidationContainer, oldPaintInvalida tionRect, oldPositionFromPaintInvalidationContainer, paintInvalidationState))
1589 invalidatePaintForOverflowIfNeeded(); 1589 invalidatePaintForOverflowIfNeeded();
1590 1590
1591 // This is for the next invalidatePaintIfNeeded so must be after invalidateP aintIfNeeded. 1591 // This is for the next invalidatePaintIfNeeded so must be after invalidateP aintIfNeeded.
1592 savePreviousBorderBoxSizeIfNeeded(); 1592 savePreviousBorderBoxSizeIfNeeded();
1593 1593
1594 // Issue paint invalidations for any scrollbars if there is a scrollable are a for this renderer. 1594 // Issue paint invalidations for any scrollbars if there is a scrollable are a for this renderer.
1595 if (enclosingLayer()) { 1595 if (enclosingLayer()) {
(...skipping 3071 matching lines...) Expand 10 before | Expand all | Expand 10 after
4667 4667
4668 // We need the old border box size only when the box has background or b ox decorations. 4668 // We need the old border box size only when the box has background or b ox decorations.
4669 if (!style()->hasBackground() && !style()->hasBoxDecorations()) 4669 if (!style()->hasBackground() && !style()->hasBoxDecorations())
4670 return; 4670 return;
4671 } 4671 }
4672 4672
4673 ensureRareData().m_previousBorderBoxSize = size(); 4673 ensureRareData().m_previousBorderBoxSize = size();
4674 } 4674 }
4675 4675
4676 } // namespace blink 4676 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698