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 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
392 frame->eventHandler().dispatchFakeMouseMoveEventSoonInQuad(quadForFakeMouseM oveEvent); | 392 frame->eventHandler().dispatchFakeMouseMoveEventSoonInQuad(quadForFakeMouseM oveEvent); |
393 | 393 |
394 bool requiresRepaint = true; | 394 bool requiresRepaint = true; |
395 | 395 |
396 if (box().view()->compositor()->inCompositingMode()) { | 396 if (box().view()->compositor()->inCompositingMode()) { |
397 // Hits in virtual/gpu/fast/canvas/canvas-scroll-path-into-view.html. | 397 // Hits in virtual/gpu/fast/canvas/canvas-scroll-path-into-view.html. |
398 DisableCompositingQueryAsserts disabler; | 398 DisableCompositingQueryAsserts disabler; |
399 bool onlyScrolledCompositedLayers = scrollsOverflow() | 399 bool onlyScrolledCompositedLayers = scrollsOverflow() |
400 && !layer()->hasVisibleNonLayerContent() | 400 && !layer()->hasVisibleNonLayerContent() |
401 && !layer()->hasNonCompositedChild() | 401 && !layer()->hasNonCompositedChild() |
402 && !layer()->hasBlockSelectionGapBounds() | |
hartmanng
2014/06/13 14:51:38
This is no longer needed, because the block select
hartmanng
2014/06/13 16:43:56
After talking with Ian offline, I think I was wron
| |
403 && !box().isMarquee(); | 402 && !box().isMarquee(); |
404 | 403 |
405 if (usesCompositedScrolling() || onlyScrolledCompositedLayers) | 404 if (usesCompositedScrolling() || onlyScrolledCompositedLayers) |
406 requiresRepaint = false; | 405 requiresRepaint = false; |
407 } | 406 } |
408 | 407 |
409 // Just schedule a full repaint of our object. | 408 // Just schedule a full repaint of our object. |
410 if (requiresRepaint) { | 409 if (requiresRepaint) { |
411 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) { | 410 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) { |
412 if (box().frameView()->isInPerformLayout()) | 411 if (box().frameView()->isInPerformLayout()) |
(...skipping 1066 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1479 DisableCompositingQueryAsserts disabler; | 1478 DisableCompositingQueryAsserts disabler; |
1480 return box().hasCompositedLayerMapping() && box().compositedLayerMapping()-> scrollingLayer(); | 1479 return box().hasCompositedLayerMapping() && box().compositedLayerMapping()-> scrollingLayer(); |
1481 } | 1480 } |
1482 | 1481 |
1483 bool RenderLayerScrollableArea::needsCompositedScrolling() const | 1482 bool RenderLayerScrollableArea::needsCompositedScrolling() const |
1484 { | 1483 { |
1485 return scrollsOverflow() && box().view()->compositor()->acceleratedCompositi ngForOverflowScrollEnabled(); | 1484 return scrollsOverflow() && box().view()->compositor()->acceleratedCompositi ngForOverflowScrollEnabled(); |
1486 } | 1485 } |
1487 | 1486 |
1488 } // Namespace WebCore | 1487 } // Namespace WebCore |
OLD | NEW |