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 2139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2150 | 2150 |
2151 // Update the positions of our child layers (if needed as only fixed layers
should be impacted by a scroll). | 2151 // Update the positions of our child layers (if needed as only fixed layers
should be impacted by a scroll). |
2152 // We don't update compositing layers, because we need to do a deep update f
rom the compositing ancestor. | 2152 // We don't update compositing layers, because we need to do a deep update f
rom the compositing ancestor. |
2153 bool inLayout = view ? view->frameView()->isInLayout() : false; | 2153 bool inLayout = view ? view->frameView()->isInLayout() : false; |
2154 if (!inLayout) { | 2154 if (!inLayout) { |
2155 // If we're in the middle of layout, we'll just update layers once layou
t has finished. | 2155 // If we're in the middle of layout, we'll just update layers once layou
t has finished. |
2156 updateLayerPositionsAfterOverflowScroll(); | 2156 updateLayerPositionsAfterOverflowScroll(); |
2157 if (view) { | 2157 if (view) { |
2158 // Update regions, scrolling may change the clip of a particular reg
ion. | 2158 // Update regions, scrolling may change the clip of a particular reg
ion. |
2159 view->frameView()->updateAnnotatedRegions(); | 2159 view->frameView()->updateAnnotatedRegions(); |
2160 | |
2161 view->updateWidgetPositions(); | 2160 view->updateWidgetPositions(); |
2162 | |
2163 view->markLazyBlocksForLayout(); | |
2164 } | 2161 } |
2165 | 2162 |
2166 updateCompositingLayersAfterScroll(); | 2163 updateCompositingLayersAfterScroll(); |
2167 } | 2164 } |
2168 | 2165 |
2169 RenderLayerModelObject* repaintContainer = renderer()->containerForRepaint()
; | 2166 RenderLayerModelObject* repaintContainer = renderer()->containerForRepaint()
; |
2170 if (frame) { | 2167 if (frame) { |
2171 // The caret rect needs to be invalidated after scrolling | 2168 // The caret rect needs to be invalidated after scrolling |
2172 frame->selection()->setCaretRectNeedsUpdate(); | 2169 frame->selection()->setCaretRectNeedsUpdate(); |
2173 | 2170 |
(...skipping 4177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6351 } | 6348 } |
6352 } | 6349 } |
6353 | 6350 |
6354 void showLayerTree(const WebCore::RenderObject* renderer) | 6351 void showLayerTree(const WebCore::RenderObject* renderer) |
6355 { | 6352 { |
6356 if (!renderer) | 6353 if (!renderer) |
6357 return; | 6354 return; |
6358 showLayerTree(renderer->enclosingLayer()); | 6355 showLayerTree(renderer->enclosingLayer()); |
6359 } | 6356 } |
6360 #endif | 6357 #endif |
OLD | NEW |