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

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

Issue 322163003: Rename AncestorDependentProperties to CompositingInputs (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Moar renaming Created 6 years, 6 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
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 1466 matching lines...) Expand 10 before | Expand all | Expand 10 after
1477 void RenderLayerScrollableArea::updateCompositingLayersAfterScroll() 1477 void RenderLayerScrollableArea::updateCompositingLayersAfterScroll()
1478 { 1478 {
1479 RenderLayerCompositor* compositor = box().view()->compositor(); 1479 RenderLayerCompositor* compositor = box().view()->compositor();
1480 if (compositor->inCompositingMode()) { 1480 if (compositor->inCompositingMode()) {
1481 if (usesCompositedScrolling()) { 1481 if (usesCompositedScrolling()) {
1482 DisableCompositingQueryAsserts disabler; 1482 DisableCompositingQueryAsserts disabler;
1483 ASSERT(box().hasCompositedLayerMapping()); 1483 ASSERT(box().hasCompositedLayerMapping());
1484 box().compositedLayerMapping()->setNeedsGraphicsLayerUpdate(); 1484 box().compositedLayerMapping()->setNeedsGraphicsLayerUpdate();
1485 compositor->setNeedsCompositingUpdate(CompositingUpdateOnCompositedS croll); 1485 compositor->setNeedsCompositingUpdate(CompositingUpdateOnCompositedS croll);
1486 } else { 1486 } else {
1487 layer()->setNeedsToUpdateAncestorDependentProperties(); 1487 layer()->setNeedsCompositingInputsUpdate();
1488 compositor->setNeedsCompositingUpdate(CompositingUpdateAfterComposit ingInputChange); 1488 compositor->setNeedsCompositingUpdate(CompositingUpdateAfterComposit ingInputChange);
1489 } 1489 }
1490 } 1490 }
1491 } 1491 }
1492 1492
1493 bool RenderLayerScrollableArea::usesCompositedScrolling() const 1493 bool RenderLayerScrollableArea::usesCompositedScrolling() const
1494 { 1494 {
1495 // Scroll form controls on the main thread so they exhibit correct touch scr oll event bubbling 1495 // Scroll form controls on the main thread so they exhibit correct touch scr oll event bubbling
1496 if (box().isIntristicallyScrollable(VerticalScrollbar) || box().isIntristica llyScrollable(HorizontalScrollbar)) 1496 if (box().isIntristicallyScrollable(VerticalScrollbar) || box().isIntristica llyScrollable(HorizontalScrollbar))
1497 return false; 1497 return false;
1498 1498
1499 // See https://codereview.chromium.org/176633003/ for the tests that fail wi thout this disabler. 1499 // See https://codereview.chromium.org/176633003/ for the tests that fail wi thout this disabler.
1500 DisableCompositingQueryAsserts disabler; 1500 DisableCompositingQueryAsserts disabler;
1501 return box().hasCompositedLayerMapping() && box().compositedLayerMapping()-> scrollingLayer(); 1501 return box().hasCompositedLayerMapping() && box().compositedLayerMapping()-> scrollingLayer();
1502 } 1502 }
1503 1503
1504 bool RenderLayerScrollableArea::needsCompositedScrolling() const 1504 bool RenderLayerScrollableArea::needsCompositedScrolling() const
1505 { 1505 {
1506 return scrollsOverflow() && box().view()->compositor()->acceleratedCompositi ngForOverflowScrollEnabled(); 1506 return scrollsOverflow() && box().view()->compositor()->acceleratedCompositi ngForOverflowScrollEnabled();
1507 } 1507 }
1508 1508
1509 } // Namespace WebCore 1509 } // Namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayer.cpp ('k') | Source/core/rendering/compositing/CompositingInputsUpdater.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698