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

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

Issue 61733005: Revert 161469 "Enable chromium_code=1 on Windows" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 7 years, 1 month 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 1384 matching lines...) Expand 10 before | Expand all | Expand 10 after
1395 // Note, the z-order lists may need to be rebuilt, but our code guarante es 1395 // Note, the z-order lists may need to be rebuilt, but our code guarante es
1396 // that we have not affected stacking, so we will not dirty 1396 // that we have not affected stacking, so we will not dirty
1397 // m_descendantsAreContiguousInStackingOrder for either us or our stacki ng 1397 // m_descendantsAreContiguousInStackingOrder for either us or our stacki ng
1398 // context or container. 1398 // context or container.
1399 layer()->didUpdateNeedsCompositedScrolling(); 1399 layer()->didUpdateNeedsCompositedScrolling();
1400 } 1400 }
1401 } 1401 }
1402 1402
1403 bool RenderLayerScrollableArea::setNeedsCompositedScrolling(bool needsComposited Scrolling) 1403 bool RenderLayerScrollableArea::setNeedsCompositedScrolling(bool needsComposited Scrolling)
1404 { 1404 {
1405 if (this->needsCompositedScrolling() == needsCompositedScrolling) 1405 if (m_needsCompositedScrolling == needsCompositedScrolling)
1406 return false; 1406 return false;
1407 1407
1408 // Count the total number of RenderLayers which need composited scrolling at 1408 // Count the total number of RenderLayers which need composited scrolling at
1409 // some point. This should be recorded at most once per RenderLayer, so we 1409 // some point. This should be recorded at most once per RenderLayer, so we
1410 // check m_willUseCompositedScrollingHasBeenRecorded. 1410 // check m_willUseCompositedScrollingHasBeenRecorded.
1411 if (layer()->acceleratedCompositingForOverflowScrollEnabled() && !m_willUseC ompositedScrollingHasBeenRecorded) { 1411 if (layer()->acceleratedCompositingForOverflowScrollEnabled() && !m_willUseC ompositedScrollingHasBeenRecorded) {
1412 blink::Platform::current()->histogramEnumeration("Renderer.CompositedScr olling", RenderLayer::WillUseCompositedScrollingBucket, RenderLayer::CompositedS crollingHistogramMax); 1412 blink::Platform::current()->histogramEnumeration("Renderer.CompositedScr olling", RenderLayer::WillUseCompositedScrollingBucket, RenderLayer::CompositedS crollingHistogramMax);
1413 m_willUseCompositedScrollingHasBeenRecorded = true; 1413 m_willUseCompositedScrollingHasBeenRecorded = true;
1414 } 1414 }
1415 1415
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
1469 void RenderLayerScrollableArea::setForceNeedsCompositedScrolling(ForceNeedsCompo sitedScrollingMode mode) 1469 void RenderLayerScrollableArea::setForceNeedsCompositedScrolling(ForceNeedsCompo sitedScrollingMode mode)
1470 { 1470 {
1471 if (m_forceNeedsCompositedScrolling == mode) 1471 if (m_forceNeedsCompositedScrolling == mode)
1472 return; 1472 return;
1473 1473
1474 m_forceNeedsCompositedScrolling = mode; 1474 m_forceNeedsCompositedScrolling = mode;
1475 layer()->didUpdateNeedsCompositedScrolling(); 1475 layer()->didUpdateNeedsCompositedScrolling();
1476 } 1476 }
1477 1477
1478 } // Namespace WebCore 1478 } // Namespace WebCore
OLDNEW
« no previous file with comments | « trunk/Source/core/rendering/RenderLayer.cpp ('k') | trunk/Source/core/rendering/RenderLayerStackingNode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698