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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
192 } | 192 } |
193 } else { | 193 } else { |
194 if (GraphicsLayer* layer = layerForHorizontalScrollbar()) { | 194 if (GraphicsLayer* layer = layerForHorizontalScrollbar()) { |
195 layer->setNeedsDisplayInRect(rect, PaintInvalidationScroll); | 195 layer->setNeedsDisplayInRect(rect, PaintInvalidationScroll); |
196 return; | 196 return; |
197 } | 197 } |
198 } | 198 } |
199 | 199 |
200 IntRect scrollRect = rect; | 200 IntRect scrollRect = rect; |
201 // If we are not yet inserted into the tree, there is no need to issue paint
invaldiations. | 201 // If we are not yet inserted into the tree, there is no need to issue paint
invaldiations. |
202 if (!box().parent()) | 202 if (!box().isRenderView() && !box().parent()) |
203 return; | 203 return; |
204 | 204 |
205 if (scrollbar == m_vBar.get()) | 205 if (scrollbar == m_vBar.get()) |
206 scrollRect.move(verticalScrollbarStart(0, box().width()), box().borderTo
p()); | 206 scrollRect.move(verticalScrollbarStart(0, box().width()), box().borderTo
p()); |
207 else | 207 else |
208 scrollRect.move(horizontalScrollbarStart(0), box().height() - box().bord
erBottom() - scrollbar->height()); | 208 scrollRect.move(horizontalScrollbarStart(0), box().height() - box().bord
erBottom() - scrollbar->height()); |
209 | 209 |
210 if (scrollRect.isEmpty()) | 210 if (scrollRect.isEmpty()) |
211 return; | 211 return; |
212 | 212 |
(...skipping 1275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1488 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild) | 1488 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild) |
1489 { | 1489 { |
1490 // We only want to track the topmost scroll child for scrollable areas with | 1490 // We only want to track the topmost scroll child for scrollable areas with |
1491 // overlay scrollbars. | 1491 // overlay scrollbars. |
1492 if (!hasOverlayScrollbars()) | 1492 if (!hasOverlayScrollbars()) |
1493 return; | 1493 return; |
1494 m_nextTopmostScrollChild = scrollChild; | 1494 m_nextTopmostScrollChild = scrollChild; |
1495 } | 1495 } |
1496 | 1496 |
1497 } // namespace blink | 1497 } // namespace blink |
OLD | NEW |