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 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
396 && !layer()->hasNonCompositedChild() | 396 && !layer()->hasNonCompositedChild() |
397 && !layer()->hasBlockSelectionGapBounds() | 397 && !layer()->hasBlockSelectionGapBounds() |
398 && box().style()->backgroundLayers().attachment() != LocalBackground
Attachment; | 398 && box().style()->backgroundLayers().attachment() != LocalBackground
Attachment; |
399 | 399 |
400 if (usesCompositedScrolling() || onlyScrolledCompositedLayers) | 400 if (usesCompositedScrolling() || onlyScrolledCompositedLayers) |
401 requiresPaintInvalidation = false; | 401 requiresPaintInvalidation = false; |
402 } | 402 } |
403 | 403 |
404 // Just schedule a full paint invalidation of our object. | 404 // Just schedule a full paint invalidation of our object. |
405 if (requiresPaintInvalidation) { | 405 if (requiresPaintInvalidation) { |
| 406 // For querying RenderLayer::compositingState() |
| 407 // This code appears correct, since scrolling outside of layout happens
during activities that do not dirty compositing state. |
| 408 DisableCompositingQueryAsserts disabler; |
406 if (box().frameView()->isInPerformLayout()) | 409 if (box().frameView()->isInPerformLayout()) |
407 box().setShouldDoFullPaintInvalidation(true); | 410 box().setShouldDoFullPaintInvalidation(true); |
408 else | 411 else |
409 box().invalidatePaintUsingContainer(paintInvalidationContainer, laye
r()->renderer()->previousPaintInvalidationRect(), InvalidationScroll); | 412 box().invalidatePaintUsingContainer(paintInvalidationContainer, laye
r()->renderer()->previousPaintInvalidationRect(), InvalidationScroll); |
410 } | 413 } |
411 | 414 |
412 // Schedule the scroll DOM event. | 415 // Schedule the scroll DOM event. |
413 if (box().node()) | 416 if (box().node()) |
414 box().node()->document().enqueueScrollEventForNode(box().node()); | 417 box().node()->document().enqueueScrollEventForNode(box().node()); |
415 | 418 |
(...skipping 1057 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1473 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild) | 1476 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild) |
1474 { | 1477 { |
1475 // We only want to track the topmost scroll child for scrollable areas with | 1478 // We only want to track the topmost scroll child for scrollable areas with |
1476 // overlay scrollbars. | 1479 // overlay scrollbars. |
1477 if (!hasOverlayScrollbars()) | 1480 if (!hasOverlayScrollbars()) |
1478 return; | 1481 return; |
1479 m_nextTopmostScrollChild = scrollChild; | 1482 m_nextTopmostScrollChild = scrollChild; |
1480 } | 1483 } |
1481 | 1484 |
1482 } // namespace blink | 1485 } // namespace blink |
OLD | NEW |