| 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 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 IntRect RenderLayerScrollableArea::scrollableAreaBoundingBox() const | 325 IntRect RenderLayerScrollableArea::scrollableAreaBoundingBox() const |
| 326 { | 326 { |
| 327 return m_layer->scrollableAreaBoundingBox(); | 327 return m_layer->scrollableAreaBoundingBox(); |
| 328 } | 328 } |
| 329 | 329 |
| 330 bool RenderLayerScrollableArea::userInputScrollable(ScrollbarOrientation orienta
tion) const | 330 bool RenderLayerScrollableArea::userInputScrollable(ScrollbarOrientation orienta
tion) const |
| 331 { | 331 { |
| 332 return m_layer->userInputScrollable(orientation); | 332 return m_layer->userInputScrollable(orientation); |
| 333 } | 333 } |
| 334 | 334 |
| 335 bool RenderLayerScrollableArea::shouldPlaceVerticalScrollbarOnLeft() const |
| 336 { |
| 337 return m_layer->shouldPlaceVerticalScrollbarOnLeft(); |
| 338 } |
| 339 |
| 335 int RenderLayerScrollableArea::pageStep(ScrollbarOrientation orientation) const | 340 int RenderLayerScrollableArea::pageStep(ScrollbarOrientation orientation) const |
| 336 { | 341 { |
| 337 return m_layer->pageStep(orientation); | 342 return m_layer->pageStep(orientation); |
| 338 } | 343 } |
| 339 | 344 |
| 340 RenderLayerModelObject* RenderLayerScrollableArea::renderer() const | 345 RenderLayerModelObject* RenderLayerScrollableArea::renderer() const |
| 341 { | 346 { |
| 342 // Only RenderBoxes can have a scrollable area, however we allocate an | 347 // Only RenderBoxes can have a scrollable area, however we allocate an |
| 343 // RenderLayerScrollableArea for any renderers (FIXME). | 348 // RenderLayerScrollableArea for any renderers (FIXME). |
| 344 return m_layer->renderer(); | 349 return m_layer->renderer(); |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 | 441 |
| 437 int maxX = scrollWidth() - box->pixelSnappedClientWidth(); | 442 int maxX = scrollWidth() - box->pixelSnappedClientWidth(); |
| 438 int maxY = scrollHeight() - box->pixelSnappedClientHeight(); | 443 int maxY = scrollHeight() - box->pixelSnappedClientHeight(); |
| 439 | 444 |
| 440 int x = std::max(std::min(scrollOffset.width(), maxX), 0); | 445 int x = std::max(std::min(scrollOffset.width(), maxX), 0); |
| 441 int y = std::max(std::min(scrollOffset.height(), maxY), 0); | 446 int y = std::max(std::min(scrollOffset.height(), maxY), 0); |
| 442 return IntSize(x, y); | 447 return IntSize(x, y); |
| 443 } | 448 } |
| 444 | 449 |
| 445 } // Namespace WebCore | 450 } // Namespace WebCore |
| OLD | NEW |