| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 1655 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1666 return false; | 1666 return false; |
| 1667 | 1667 |
| 1668 // If the main thread updates the scroll position for this FrameView, we sho
uld return | 1668 // If the main thread updates the scroll position for this FrameView, we sho
uld return |
| 1669 // ScrollAnimator::isRubberBandInProgress(). | 1669 // ScrollAnimator::isRubberBandInProgress(). |
| 1670 if (ScrollAnimator* scrollAnimator = existingScrollAnimator()) | 1670 if (ScrollAnimator* scrollAnimator = existingScrollAnimator()) |
| 1671 return scrollAnimator->isRubberBandInProgress(); | 1671 return scrollAnimator->isRubberBandInProgress(); |
| 1672 | 1672 |
| 1673 return false; | 1673 return false; |
| 1674 } | 1674 } |
| 1675 | 1675 |
| 1676 bool FrameView::rubberBandingOnCompositorThread() const |
| 1677 { |
| 1678 return m_frame->settings()->rubberBandingOnCompositorThread(); |
| 1679 } |
| 1680 |
| 1676 HostWindow* FrameView::hostWindow() const | 1681 HostWindow* FrameView::hostWindow() const |
| 1677 { | 1682 { |
| 1678 Page* page = frame().page(); | 1683 Page* page = frame().page(); |
| 1679 if (!page) | 1684 if (!page) |
| 1680 return 0; | 1685 return 0; |
| 1681 return &page->chrome(); | 1686 return &page->chrome(); |
| 1682 } | 1687 } |
| 1683 | 1688 |
| 1684 void FrameView::contentRectangleForPaintInvalidation(const IntRect& rect) | 1689 void FrameView::contentRectangleForPaintInvalidation(const IntRect& rect) |
| 1685 { | 1690 { |
| (...skipping 2271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3957 return; | 3962 return; |
| 3958 | 3963 |
| 3959 ScrollableArea::setScrollOrigin(origin); | 3964 ScrollableArea::setScrollOrigin(origin); |
| 3960 | 3965 |
| 3961 // Update if the scroll origin changes, since our position will be different
if the content size did not change. | 3966 // Update if the scroll origin changes, since our position will be different
if the content size did not change. |
| 3962 if (updatePositionAtAll && updatePositionSynchronously) | 3967 if (updatePositionAtAll && updatePositionSynchronously) |
| 3963 updateScrollbars(scrollOffsetDouble()); | 3968 updateScrollbars(scrollOffsetDouble()); |
| 3964 } | 3969 } |
| 3965 | 3970 |
| 3966 } // namespace blink | 3971 } // namespace blink |
| OLD | NEW |