| 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 760 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 771 | 771 |
| 772 // FIXME: Need to detect a swap from custom to native scrollbars (and vice v
ersa). | 772 // FIXME: Need to detect a swap from custom to native scrollbars (and vice v
ersa). |
| 773 if (m_hBar) | 773 if (m_hBar) |
| 774 m_hBar->styleChanged(); | 774 m_hBar->styleChanged(); |
| 775 if (m_vBar) | 775 if (m_vBar) |
| 776 m_vBar->styleChanged(); | 776 m_vBar->styleChanged(); |
| 777 | 777 |
| 778 updateScrollCornerStyle(); | 778 updateScrollCornerStyle(); |
| 779 updateResizerAreaSet(); | 779 updateResizerAreaSet(); |
| 780 updateResizerStyle(); | 780 updateResizerStyle(); |
| 781 | |
| 782 // FIXME: Remove incremental compositing updates after fixing the chicken/eg
g issues | |
| 783 // https://code.google.com/p/chromium/issues/detail?id=343756 | |
| 784 DisableCompositingQueryAsserts disabler; | |
| 785 RenderLayer* layer = this->layer(); | |
| 786 if (layer->hasCompositedLayerMapping() && layer->compositedLayerMapping()->u
pdateGraphicsLayerConfiguration(GraphicsLayerUpdater::ForceUpdate)) | |
| 787 layer->compositor()->setCompositingLayersNeedRebuild(); | |
| 788 } | 781 } |
| 789 | 782 |
| 790 void RenderLayerScrollableArea::updateAfterCompositingChange() | 783 void RenderLayerScrollableArea::updateAfterCompositingChange() |
| 791 { | 784 { |
| 792 layer()->updateScrollingStateAfterCompositingChange(); | 785 layer()->updateScrollingStateAfterCompositingChange(); |
| 793 } | 786 } |
| 794 | 787 |
| 795 void RenderLayerScrollableArea::updateAfterOverflowRecalc() | 788 void RenderLayerScrollableArea::updateAfterOverflowRecalc() |
| 796 { | 789 { |
| 797 computeScrollDimensions(); | 790 computeScrollDimensions(); |
| (...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1506 DisableCompositingQueryAsserts disabler; | 1499 DisableCompositingQueryAsserts disabler; |
| 1507 return box().hasCompositedLayerMapping() && box().compositedLayerMapping()->
scrollingLayer(); | 1500 return box().hasCompositedLayerMapping() && box().compositedLayerMapping()->
scrollingLayer(); |
| 1508 } | 1501 } |
| 1509 | 1502 |
| 1510 bool RenderLayerScrollableArea::needsCompositedScrolling() const | 1503 bool RenderLayerScrollableArea::needsCompositedScrolling() const |
| 1511 { | 1504 { |
| 1512 return scrollsOverflow() && box().view()->compositor()->acceleratedCompositi
ngForOverflowScrollEnabled(); | 1505 return scrollsOverflow() && box().view()->compositor()->acceleratedCompositi
ngForOverflowScrollEnabled(); |
| 1513 } | 1506 } |
| 1514 | 1507 |
| 1515 } // Namespace WebCore | 1508 } // Namespace WebCore |
| OLD | NEW |