| 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 1236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1247 void FrameView::scrollContentsIfNeeded() | 1247 void FrameView::scrollContentsIfNeeded() |
| 1248 { | 1248 { |
| 1249 bool didScroll = !pendingScrollDelta().isZero(); | 1249 bool didScroll = !pendingScrollDelta().isZero(); |
| 1250 ScrollView::scrollContentsIfNeeded(); | 1250 ScrollView::scrollContentsIfNeeded(); |
| 1251 if (didScroll) | 1251 if (didScroll) |
| 1252 updateFixedElementPaintInvalidationRectsAfterScroll(); | 1252 updateFixedElementPaintInvalidationRectsAfterScroll(); |
| 1253 } | 1253 } |
| 1254 | 1254 |
| 1255 bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta, const IntRect
& rectToScroll) | 1255 bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta, const IntRect
& rectToScroll) |
| 1256 { | 1256 { |
| 1257 if (!contentsInCompositedLayer()) | 1257 if (!contentsInCompositedLayer() || hasSlowRepaintObjects()) |
| 1258 return false; | 1258 return false; |
| 1259 | 1259 |
| 1260 if (!m_viewportConstrainedObjects || m_viewportConstrainedObjects->isEmpty()
) { | 1260 if (!m_viewportConstrainedObjects || m_viewportConstrainedObjects->isEmpty()
) { |
| 1261 hostWindow()->scroll(); | 1261 hostWindow()->scroll(); |
| 1262 return true; | 1262 return true; |
| 1263 } | 1263 } |
| 1264 | 1264 |
| 1265 // Get the rects of the fixed objects visible in the rectToScroll | 1265 // Get the rects of the fixed objects visible in the rectToScroll |
| 1266 Region regionToUpdate; | 1266 Region regionToUpdate; |
| 1267 ViewportConstrainedObjectSet::const_iterator end = m_viewportConstrainedObje
cts->end(); | 1267 ViewportConstrainedObjectSet::const_iterator end = m_viewportConstrainedObje
cts->end(); |
| (...skipping 1864 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3132 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3132 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
| 3133 { | 3133 { |
| 3134 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3134 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
| 3135 if (AXObjectCache* cache = axObjectCache()) { | 3135 if (AXObjectCache* cache = axObjectCache()) { |
| 3136 cache->remove(scrollbar); | 3136 cache->remove(scrollbar); |
| 3137 cache->handleScrollbarUpdate(this); | 3137 cache->handleScrollbarUpdate(this); |
| 3138 } | 3138 } |
| 3139 } | 3139 } |
| 3140 | 3140 |
| 3141 } // namespace blink | 3141 } // namespace blink |
| OLD | NEW |