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 2280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2291 // If scrollbars aren't explicitly forbidden, permit scrolling. | 2291 // If scrollbars aren't explicitly forbidden, permit scrolling. |
2292 if (frameElementBase && frameElementBase->scrollingMode() != ScrollbarAlways
Off) | 2292 if (frameElementBase && frameElementBase->scrollingMode() != ScrollbarAlways
Off) |
2293 return true; | 2293 return true; |
2294 | 2294 |
2295 // If scrollbars are forbidden, user initiated scrolls should obviously be i
gnored. | 2295 // If scrollbars are forbidden, user initiated scrolls should obviously be i
gnored. |
2296 if (frameView->wasScrolledByUser()) | 2296 if (frameView->wasScrolledByUser()) |
2297 return false; | 2297 return false; |
2298 | 2298 |
2299 // Forbid autoscrolls when scrollbars are off, but permits other programmati
c scrolls, | 2299 // Forbid autoscrolls when scrollbars are off, but permits other programmati
c scrolls, |
2300 // like navigation to an anchor. | 2300 // like navigation to an anchor. |
2301 Page* page = frameView->frame()->page(); | 2301 Page* page = frameView->frame().page(); |
2302 if (!page) | 2302 if (!page) |
2303 return false; | 2303 return false; |
2304 return !page->autoscrollInProgress(); | 2304 return !page->autoscrollInProgress(); |
2305 } | 2305 } |
2306 | 2306 |
2307 void RenderLayer::scrollRectToVisible(const LayoutRect& rect, const ScrollAlignm
ent& alignX, const ScrollAlignment& alignY) | 2307 void RenderLayer::scrollRectToVisible(const LayoutRect& rect, const ScrollAlignm
ent& alignX, const ScrollAlignment& alignY) |
2308 { | 2308 { |
2309 RenderLayer* parentLayer = 0; | 2309 RenderLayer* parentLayer = 0; |
2310 LayoutRect newRect = rect; | 2310 LayoutRect newRect = rect; |
2311 | 2311 |
(...skipping 4161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6473 } | 6473 } |
6474 } | 6474 } |
6475 | 6475 |
6476 void showLayerTree(const WebCore::RenderObject* renderer) | 6476 void showLayerTree(const WebCore::RenderObject* renderer) |
6477 { | 6477 { |
6478 if (!renderer) | 6478 if (!renderer) |
6479 return; | 6479 return; |
6480 showLayerTree(renderer->enclosingLayer()); | 6480 showLayerTree(renderer->enclosingLayer()); |
6481 } | 6481 } |
6482 #endif | 6482 #endif |
OLD | NEW |