| 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 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1192 DisableCompositingQueryAsserts disabler; | 1192 DisableCompositingQueryAsserts disabler; |
| 1193 | 1193 |
| 1194 if (m_slowRepaintObjectCount > 0) | 1194 if (m_slowRepaintObjectCount > 0) |
| 1195 return true; | 1195 return true; |
| 1196 | 1196 |
| 1197 if (contentsInCompositedLayer()) | 1197 if (contentsInCompositedLayer()) |
| 1198 return false; | 1198 return false; |
| 1199 | 1199 |
| 1200 // The chromium compositor does not support scrolling a non-composited frame
within a composited page through | 1200 // The chromium compositor does not support scrolling a non-composited frame
within a composited page through |
| 1201 // the fast scrolling path, so force slow scrolling in that case. | 1201 // the fast scrolling path, so force slow scrolling in that case. |
| 1202 if (m_frame->owner() && !hasCompositedContent() && m_frame->page() && m_fram
e->page()->mainFrame()->view()->hasCompositedContent()) | 1202 if (m_frame->owner() && !hasCompositedContent() && m_frame->page() && m_fram
e->page()->mainFrame()->isLocalFrame() && toLocalFrame(m_frame->page()->mainFram
e())->view()->hasCompositedContent()) |
| 1203 return true; | 1203 return true; |
| 1204 | 1204 |
| 1205 if (m_isOverlapped && considerOverlap) | 1205 if (m_isOverlapped && considerOverlap) |
| 1206 return true; | 1206 return true; |
| 1207 | 1207 |
| 1208 if (m_cannotBlitToWindow) | 1208 if (m_cannotBlitToWindow) |
| 1209 return true; | 1209 return true; |
| 1210 | 1210 |
| 1211 if (!m_contentIsOpaque) | 1211 if (!m_contentIsOpaque) |
| 1212 return true; | 1212 return true; |
| (...skipping 2082 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3295 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3295 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
| 3296 { | 3296 { |
| 3297 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3297 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
| 3298 if (AXObjectCache* cache = axObjectCache()) { | 3298 if (AXObjectCache* cache = axObjectCache()) { |
| 3299 cache->remove(scrollbar); | 3299 cache->remove(scrollbar); |
| 3300 cache->handleScrollbarUpdate(this); | 3300 cache->handleScrollbarUpdate(this); |
| 3301 } | 3301 } |
| 3302 } | 3302 } |
| 3303 | 3303 |
| 3304 } // namespace WebCore | 3304 } // namespace WebCore |
| OLD | NEW |