Chromium Code Reviews

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

Issue 516603003: Revert of Make the compositing assert disabler for paint invalidation more targeted. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderLayer.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('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) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 385 matching lines...)
396 && !layer()->hasNonCompositedChild() 396 && !layer()->hasNonCompositedChild()
397 && !layer()->hasBlockSelectionGapBounds() 397 && !layer()->hasBlockSelectionGapBounds()
398 && box().style()->backgroundLayers().attachment() != LocalBackground Attachment; 398 && box().style()->backgroundLayers().attachment() != LocalBackground Attachment;
399 399
400 if (usesCompositedScrolling() || onlyScrolledCompositedLayers) 400 if (usesCompositedScrolling() || onlyScrolledCompositedLayers)
401 requiresPaintInvalidation = false; 401 requiresPaintInvalidation = false;
402 } 402 }
403 403
404 // Just schedule a full paint invalidation of our object. 404 // Just schedule a full paint invalidation of our object.
405 if (requiresPaintInvalidation) { 405 if (requiresPaintInvalidation) {
406 // For querying RenderLayer::compositingState()
407 // This code appears correct, since scrolling outside of layout happens during activities that do not dirty compositing state.
408 DisableCompositingQueryAsserts disabler;
409 if (box().frameView()->isInPerformLayout()) 406 if (box().frameView()->isInPerformLayout())
410 box().setShouldDoFullPaintInvalidation(true); 407 box().setShouldDoFullPaintInvalidation(true);
411 else 408 else
412 box().invalidatePaintUsingContainer(paintInvalidationContainer, laye r()->renderer()->previousPaintInvalidationRect(), InvalidationScroll); 409 box().invalidatePaintUsingContainer(paintInvalidationContainer, laye r()->renderer()->previousPaintInvalidationRect(), InvalidationScroll);
413 } 410 }
414 411
415 // Schedule the scroll DOM event. 412 // Schedule the scroll DOM event.
416 if (box().node()) 413 if (box().node())
417 box().node()->document().enqueueScrollEventForNode(box().node()); 414 box().node()->document().enqueueScrollEventForNode(box().node());
418 415
(...skipping 1057 matching lines...)
1476 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild) 1473 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild)
1477 { 1474 {
1478 // We only want to track the topmost scroll child for scrollable areas with 1475 // We only want to track the topmost scroll child for scrollable areas with
1479 // overlay scrollbars. 1476 // overlay scrollbars.
1480 if (!hasOverlayScrollbars()) 1477 if (!hasOverlayScrollbars())
1481 return; 1478 return;
1482 m_nextTopmostScrollChild = scrollChild; 1479 m_nextTopmostScrollChild = scrollChild;
1483 } 1480 }
1484 1481
1485 } // namespace blink 1482 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayer.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine