Chromium Code Reviews| 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 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 493 | 493 |
| 494 if (renderer()->hasOverflowClip()) | 494 if (renderer()->hasOverflowClip()) |
| 495 flags |= HasSeenAncestorWithOverflowClip; | 495 flags |= HasSeenAncestorWithOverflowClip; |
| 496 | 496 |
| 497 if (flags & HasSeenViewportConstrainedAncestor | 497 if (flags & HasSeenViewportConstrainedAncestor |
| 498 || (flags & IsOverflowScroll && flags & HasSeenAncestorWithOverflowClip && !m_canSkipRepaintRectsUpdateOnScroll)) { | 498 || (flags & IsOverflowScroll && flags & HasSeenAncestorWithOverflowClip && !m_canSkipRepaintRectsUpdateOnScroll)) { |
| 499 // FIXME: Remove incremental compositing updates after fixing the chicke n/egg issues | 499 // FIXME: Remove incremental compositing updates after fixing the chicke n/egg issues |
| 500 // https://code.google.com/p/chromium/issues/detail?id=343756 | 500 // https://code.google.com/p/chromium/issues/detail?id=343756 |
| 501 DisableCompositingQueryAsserts disabler; | 501 DisableCompositingQueryAsserts disabler; |
| 502 // FIXME: We could track the repaint container as we walk down the tree. | 502 // FIXME: We could track the repaint container as we walk down the tree. |
| 503 repainter().computeRepaintRects(renderer()->containerForRepaint(), geome tryMap); | 503 // repainter().computeRepaintRects(renderer()->containerForRepaint(), ge ometryMap); |
| 504 // FIXME: This may cause extra repaints. | |
| 505 repainter().repaintIncludingNonCompositingDescendants(renderer()->contai nerForRepaint()); | |
|
abarth-chromium
2014/03/08 06:54:52
I'm not sure I understand what's changing here...
| |
| 504 } else { | 506 } else { |
| 505 // Check that RenderLayerRepainter's cached rects are correct. | 507 // Check that RenderLayerRepainter's cached rects are correct. |
| 506 // FIXME: re-enable these assertions when the issue with table cells is resolved: https://bugs.webkit.org/show_bug.cgi?id=103432 | 508 // FIXME: re-enable these assertions when the issue with table cells is resolved: https://bugs.webkit.org/show_bug.cgi?id=103432 |
| 507 // ASSERT(repainter().m_repaintRect == renderer()->clippedOverflowRectFo rRepaint(renderer()->containerForRepaint())); | 509 // ASSERT(repainter().m_repaintRect == renderer()->clippedOverflowRectFo rRepaint(renderer()->containerForRepaint())); |
| 508 // ASSERT(repainter().m_outlineBox == renderer()->outlineBoundsForRepain t(renderer()->containerForRepaint(), geometryMap)); | 510 // ASSERT(repainter().m_outlineBox == renderer()->outlineBoundsForRepain t(renderer()->containerForRepaint(), geometryMap)); |
| 509 } | 511 } |
| 510 | 512 |
| 511 for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) | 513 for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) |
| 512 child->updateLayerPositionsAfterScroll(geometryMap, flags); | 514 child->updateLayerPositionsAfterScroll(geometryMap, flags); |
| 513 | 515 |
| (...skipping 3517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4031 } | 4033 } |
| 4032 } | 4034 } |
| 4033 | 4035 |
| 4034 void showLayerTree(const WebCore::RenderObject* renderer) | 4036 void showLayerTree(const WebCore::RenderObject* renderer) |
| 4035 { | 4037 { |
| 4036 if (!renderer) | 4038 if (!renderer) |
| 4037 return; | 4039 return; |
| 4038 showLayerTree(renderer->enclosingLayer()); | 4040 showLayerTree(renderer->enclosingLayer()); |
| 4039 } | 4041 } |
| 4040 #endif | 4042 #endif |
| OLD | NEW |