| OLD | NEW |
| 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 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 290 { | 290 { |
| 291 // FIXME: Remove incremental compositing updates after fixing the chicke
n/egg issues | 291 // FIXME: Remove incremental compositing updates after fixing the chicke
n/egg issues |
| 292 // https://code.google.com/p/chromium/issues/detail?id=343756 | 292 // https://code.google.com/p/chromium/issues/detail?id=343756 |
| 293 DisableCompositingQueryAsserts disabler; | 293 DisableCompositingQueryAsserts disabler; |
| 294 updatePaginationRecursive(enclosingPaginationLayer()); | 294 updatePaginationRecursive(enclosingPaginationLayer()); |
| 295 } | 295 } |
| 296 } | 296 } |
| 297 | 297 |
| 298 void PaintLayer::updateLayerPositionRecursive() | 298 void PaintLayer::updateLayerPositionRecursive() |
| 299 { | 299 { |
| 300 if (m_scrollableArea) |
| 301 m_scrollableArea->clampPositionAfterLayout(); |
| 302 |
| 300 updateLayerPosition(); | 303 updateLayerPosition(); |
| 301 | 304 |
| 302 if (m_rareData && m_rareData->reflectionInfo) | 305 if (m_rareData && m_rareData->reflectionInfo) |
| 303 m_rareData->reflectionInfo->reflection()->layout(); | 306 m_rareData->reflectionInfo->reflection()->layout(); |
| 304 | 307 |
| 305 // FIXME(400589): We would like to do this in PaintLayerScrollableArea::upda
teAfterLayout, | 308 // FIXME(400589): We would like to do this in PaintLayerScrollableArea::upda
teAfterLayout, |
| 306 // but it depends on the size computed by updateLayerPosition. | 309 // but it depends on the size computed by updateLayerPosition. |
| 307 if (m_scrollableArea) { | 310 if (m_scrollableArea) { |
| 308 if (ScrollAnimatorBase* scrollAnimator = m_scrollableArea->existingScrol
lAnimator()) | 311 if (ScrollAnimatorBase* scrollAnimator = m_scrollableArea->existingScrol
lAnimator()) |
| 309 scrollAnimator->updateAfterLayout(); | 312 scrollAnimator->updateAfterLayout(); |
| (...skipping 2568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2878 | 2881 |
| 2879 void showLayerTree(const blink::LayoutObject* layoutObject) | 2882 void showLayerTree(const blink::LayoutObject* layoutObject) |
| 2880 { | 2883 { |
| 2881 if (!layoutObject) { | 2884 if (!layoutObject) { |
| 2882 fprintf(stderr, "Cannot showLayerTree. Root is (nil)\n"); | 2885 fprintf(stderr, "Cannot showLayerTree. Root is (nil)\n"); |
| 2883 return; | 2886 return; |
| 2884 } | 2887 } |
| 2885 showLayerTree(layoutObject->enclosingLayer()); | 2888 showLayerTree(layoutObject->enclosingLayer()); |
| 2886 } | 2889 } |
| 2887 #endif | 2890 #endif |
| OLD | NEW |