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

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

Issue 459083002: Position overflow controls during layout. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | « no previous file | Source/core/rendering/RenderLayerScrollableArea.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 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 // FIXME: Remove incremental compositing updates after fixing the chicke n/egg issues 253 // FIXME: Remove incremental compositing updates after fixing the chicke n/egg issues
254 // https://code.google.com/p/chromium/issues/detail?id=343756 254 // https://code.google.com/p/chromium/issues/detail?id=343756
255 DisableCompositingQueryAsserts disabler; 255 DisableCompositingQueryAsserts disabler;
256 bool needsPaginationUpdate = isPaginated() || enclosingPaginationLayer() ; 256 bool needsPaginationUpdate = isPaginated() || enclosingPaginationLayer() ;
257 updatePaginationRecursive(needsPaginationUpdate); 257 updatePaginationRecursive(needsPaginationUpdate);
258 } 258 }
259 } 259 }
260 260
261 void RenderLayer::updateLayerPositionRecursive() 261 void RenderLayer::updateLayerPositionRecursive()
262 { 262 {
263 if (hasOverflowControls()) {
264 // FIXME: We should figure out the right time to position the overflow c ontrols.
265 // This call appears to be necessary to pass some layout test that use E ventSender,
266 // presumably because the normal time to position the controls is during paint. We
267 // probably shouldn't position the overflow controls during paint either ...
268 DisableCompositingQueryAsserts disabler;
269 scrollableArea()->positionOverflowControls(IntSize());
270 }
271
272 if (m_reflectionInfo) 263 if (m_reflectionInfo)
273 m_reflectionInfo->reflection()->layout(); 264 m_reflectionInfo->reflection()->layout();
274 265
275 // FIXME: We should be able to remove this call because we don't care about 266 // FIXME: We should be able to remove this call because we don't care about
276 // any descendant-dependent flags, but code somewhere else is reading these 267 // any descendant-dependent flags, but code somewhere else is reading these
277 // flags and depending on us to update them. 268 // flags and depending on us to update them.
278 updateDescendantDependentFlags(); 269 updateDescendantDependentFlags();
279 270
280 for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) 271 for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
281 child->updateLayerPositionRecursive(); 272 child->updateLayerPositionRecursive();
(...skipping 3463 matching lines...) Expand 10 before | Expand all | Expand 10 after
3745 } 3736 }
3746 } 3737 }
3747 3738
3748 void showLayerTree(const blink::RenderObject* renderer) 3739 void showLayerTree(const blink::RenderObject* renderer)
3749 { 3740 {
3750 if (!renderer) 3741 if (!renderer)
3751 return; 3742 return;
3752 showLayerTree(renderer->enclosingLayer()); 3743 showLayerTree(renderer->enclosingLayer());
3753 } 3744 }
3754 #endif 3745 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderLayerScrollableArea.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698