| 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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 m_resizer->destroy(); | 139 m_resizer->destroy(); |
| 140 } | 140 } |
| 141 | 141 |
| 142 GraphicsLayer* RenderLayerScrollableArea::layerForScrolling() const | 142 GraphicsLayer* RenderLayerScrollableArea::layerForScrolling() const |
| 143 { | 143 { |
| 144 return m_box->hasCompositedLayerMapping() ? m_box->compositedLayerMapping()-
>scrollingContentsLayer() : 0; | 144 return m_box->hasCompositedLayerMapping() ? m_box->compositedLayerMapping()-
>scrollingContentsLayer() : 0; |
| 145 } | 145 } |
| 146 | 146 |
| 147 GraphicsLayer* RenderLayerScrollableArea::layerForHorizontalScrollbar() const | 147 GraphicsLayer* RenderLayerScrollableArea::layerForHorizontalScrollbar() const |
| 148 { | 148 { |
| 149 // See crbug.com/343132. |
| 150 DisableCompositingQueryAsserts disabler; |
| 151 |
| 149 return m_box->hasCompositedLayerMapping() ? m_box->compositedLayerMapping()-
>layerForHorizontalScrollbar() : 0; | 152 return m_box->hasCompositedLayerMapping() ? m_box->compositedLayerMapping()-
>layerForHorizontalScrollbar() : 0; |
| 150 } | 153 } |
| 151 | 154 |
| 152 GraphicsLayer* RenderLayerScrollableArea::layerForVerticalScrollbar() const | 155 GraphicsLayer* RenderLayerScrollableArea::layerForVerticalScrollbar() const |
| 153 { | 156 { |
| 157 // See crbug.com/343132. |
| 158 DisableCompositingQueryAsserts disabler; |
| 159 |
| 154 return m_box->hasCompositedLayerMapping() ? m_box->compositedLayerMapping()-
>layerForVerticalScrollbar() : 0; | 160 return m_box->hasCompositedLayerMapping() ? m_box->compositedLayerMapping()-
>layerForVerticalScrollbar() : 0; |
| 155 } | 161 } |
| 156 | 162 |
| 157 GraphicsLayer* RenderLayerScrollableArea::layerForScrollCorner() const | 163 GraphicsLayer* RenderLayerScrollableArea::layerForScrollCorner() const |
| 158 { | 164 { |
| 165 // See crbug.com/343132. |
| 166 DisableCompositingQueryAsserts disabler; |
| 167 |
| 159 return m_box->hasCompositedLayerMapping() ? m_box->compositedLayerMapping()-
>layerForScrollCorner() : 0; | 168 return m_box->hasCompositedLayerMapping() ? m_box->compositedLayerMapping()-
>layerForScrollCorner() : 0; |
| 160 } | 169 } |
| 161 | 170 |
| 162 void RenderLayerScrollableArea::invalidateScrollbarRect(Scrollbar* scrollbar, co
nst IntRect& rect) | 171 void RenderLayerScrollableArea::invalidateScrollbarRect(Scrollbar* scrollbar, co
nst IntRect& rect) |
| 163 { | 172 { |
| 173 // See crbug.com/343132. |
| 174 DisableCompositingQueryAsserts disabler; |
| 175 |
| 164 if (scrollbar == m_vBar.get()) { | 176 if (scrollbar == m_vBar.get()) { |
| 165 if (GraphicsLayer* layer = layerForVerticalScrollbar()) { | 177 if (GraphicsLayer* layer = layerForVerticalScrollbar()) { |
| 166 layer->setNeedsDisplayInRect(rect); | 178 layer->setNeedsDisplayInRect(rect); |
| 167 return; | 179 return; |
| 168 } | 180 } |
| 169 } else { | 181 } else { |
| 170 if (GraphicsLayer* layer = layerForHorizontalScrollbar()) { | 182 if (GraphicsLayer* layer = layerForHorizontalScrollbar()) { |
| 171 layer->setNeedsDisplayInRect(rect); | 183 layer->setNeedsDisplayInRect(rect); |
| 172 return; | 184 return; |
| 173 } | 185 } |
| (...skipping 1337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1511 void RenderLayerScrollableArea::setForceNeedsCompositedScrolling(ForceNeedsCompo
sitedScrollingMode mode) | 1523 void RenderLayerScrollableArea::setForceNeedsCompositedScrolling(ForceNeedsCompo
sitedScrollingMode mode) |
| 1512 { | 1524 { |
| 1513 if (m_forceNeedsCompositedScrolling == mode) | 1525 if (m_forceNeedsCompositedScrolling == mode) |
| 1514 return; | 1526 return; |
| 1515 | 1527 |
| 1516 m_forceNeedsCompositedScrolling = mode; | 1528 m_forceNeedsCompositedScrolling = mode; |
| 1517 layer()->didUpdateNeedsCompositedScrolling(); | 1529 layer()->didUpdateNeedsCompositedScrolling(); |
| 1518 } | 1530 } |
| 1519 | 1531 |
| 1520 } // Namespace WebCore | 1532 } // Namespace WebCore |
| OLD | NEW |