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 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 if (scrollRect.isEmpty()) | 200 if (scrollRect.isEmpty()) |
201 return; | 201 return; |
202 | 202 |
203 LayoutRect repaintRect = scrollRect; | 203 LayoutRect repaintRect = scrollRect; |
204 box().flipForWritingMode(repaintRect); | 204 box().flipForWritingMode(repaintRect); |
205 | 205 |
206 IntRect intRect = pixelSnappedIntRect(repaintRect); | 206 IntRect intRect = pixelSnappedIntRect(repaintRect); |
207 | 207 |
208 if (box().frameView()->isInPerformLayout()) { | 208 if (box().frameView()->isInPerformLayout()) { |
209 if (scrollbar == m_vBar.get()) { | 209 if (scrollbar == m_vBar.get()) { |
210 m_verticalBarDamage = intRect; | 210 m_verticalBarDamage.unite(intRect); |
211 m_hasVerticalBarDamage = true; | 211 m_hasVerticalBarDamage = true; |
212 } else { | 212 } else { |
213 m_horizontalBarDamage = intRect; | 213 m_horizontalBarDamage.unite(intRect); |
214 m_hasHorizontalBarDamage = true; | 214 m_hasHorizontalBarDamage = true; |
215 } | 215 } |
216 | 216 box().setMayNeedPaintInvalidation(true); |
217 } else { | 217 } else { |
218 box().invalidatePaintRectangle(intRect); | 218 box().invalidatePaintRectangle(intRect); |
219 } | 219 } |
220 } | 220 } |
221 | 221 |
222 void RenderLayerScrollableArea::invalidateScrollCornerRect(const IntRect& rect) | 222 void RenderLayerScrollableArea::invalidateScrollCornerRect(const IntRect& rect) |
223 { | 223 { |
224 if (GraphicsLayer* layer = layerForScrollCorner()) { | 224 if (GraphicsLayer* layer = layerForScrollCorner()) { |
225 layer->setNeedsDisplayInRect(rect); | 225 layer->setNeedsDisplayInRect(rect); |
226 return; | 226 return; |
(...skipping 1240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1467 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild) | 1467 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild) |
1468 { | 1468 { |
1469 // We only want to track the topmost scroll child for scrollable areas with | 1469 // We only want to track the topmost scroll child for scrollable areas with |
1470 // overlay scrollbars. | 1470 // overlay scrollbars. |
1471 if (!hasOverlayScrollbars()) | 1471 if (!hasOverlayScrollbars()) |
1472 return; | 1472 return; |
1473 m_nextTopmostScrollChild = scrollChild; | 1473 m_nextTopmostScrollChild = scrollChild; |
1474 } | 1474 } |
1475 | 1475 |
1476 } // Namespace WebCore | 1476 } // Namespace WebCore |
OLD | NEW |