Chromium Code Reviews| 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 1143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1154 DisableCompositingQueryAsserts disabler; | 1154 DisableCompositingQueryAsserts disabler; |
| 1155 | 1155 |
| 1156 if (m_slowRepaintObjectCount > 0) | 1156 if (m_slowRepaintObjectCount > 0) |
| 1157 return true; | 1157 return true; |
| 1158 | 1158 |
| 1159 if (contentsInCompositedLayer()) | 1159 if (contentsInCompositedLayer()) |
| 1160 return false; | 1160 return false; |
| 1161 | 1161 |
| 1162 // The chromium compositor does not support scrolling a non-composited frame within a composited page through | 1162 // The chromium compositor does not support scrolling a non-composited frame within a composited page through |
| 1163 // the fast scrolling path, so force slow scrolling in that case. | 1163 // the fast scrolling path, so force slow scrolling in that case. |
| 1164 if (m_frame->owner() && !hasCompositedContent() && m_frame->page() && m_fram e->page()->mainFrame()->isLocalFrame() && m_frame->page()->deprecatedLocalMainFr ame()->view()->hasCompositedContent()) | 1164 if (m_frame->owner() && !hasCompositedContent() && m_frame->page() && m_fram e->localFrameRoot()->view()->hasCompositedContent()) |
|
eseidel
2014/07/11 16:33:03
Folks more active in the compositor or repaint sys
| |
| 1165 return true; | 1165 return true; |
| 1166 | 1166 |
| 1167 if (m_isOverlapped && considerOverlap) | 1167 if (m_isOverlapped && considerOverlap) |
| 1168 return true; | 1168 return true; |
| 1169 | 1169 |
| 1170 if (m_cannotBlitToWindow) | 1170 if (m_cannotBlitToWindow) |
| 1171 return true; | 1171 return true; |
| 1172 | 1172 |
| 1173 if (!m_contentIsOpaque) | 1173 if (!m_contentIsOpaque) |
| 1174 return true; | 1174 return true; |
| (...skipping 1633 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2808 | 2808 |
| 2809 updateLayoutAndStyleIfNeededRecursive(); | 2809 updateLayoutAndStyleIfNeededRecursive(); |
| 2810 | 2810 |
| 2811 if (RenderView* view = renderView()) { | 2811 if (RenderView* view = renderView()) { |
| 2812 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Up dateLayerTree", "frame", m_frame.get()); | 2812 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Up dateLayerTree", "frame", m_frame.get()); |
| 2813 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Ti meline migrates to tracing. | 2813 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Ti meline migrates to tracing. |
| 2814 InspectorInstrumentation::willUpdateLayerTree(m_frame.get()); | 2814 InspectorInstrumentation::willUpdateLayerTree(m_frame.get()); |
| 2815 | 2815 |
| 2816 view->compositor()->updateIfNeededRecursive(); | 2816 view->compositor()->updateIfNeededRecursive(); |
| 2817 | 2817 |
| 2818 if (view->compositor()->inCompositingMode() && m_frame->isMainFrame()) | 2818 if (view->compositor()->inCompositingMode() && m_frame->isLocalRoot()) |
| 2819 m_frame->page()->scrollingCoordinator()->updateAfterCompositingChang eIfNeeded(); | 2819 m_frame->page()->scrollingCoordinator()->updateAfterCompositingChang eIfNeeded(); |
| 2820 | 2820 |
| 2821 updateCompositedSelectionBoundsIfNeeded(); | 2821 updateCompositedSelectionBoundsIfNeeded(); |
| 2822 | 2822 |
| 2823 InspectorInstrumentation::didUpdateLayerTree(m_frame.get()); | 2823 InspectorInstrumentation::didUpdateLayerTree(m_frame.get()); |
| 2824 | 2824 |
| 2825 invalidateTreeIfNeededRecursive(); | 2825 invalidateTreeIfNeededRecursive(); |
| 2826 } | 2826 } |
| 2827 | 2827 |
| 2828 scrollContentsIfNeededRecursive(); | 2828 scrollContentsIfNeededRecursive(); |
| (...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3276 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) | 3276 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) |
| 3277 { | 3277 { |
| 3278 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3278 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
| 3279 if (AXObjectCache* cache = axObjectCache()) { | 3279 if (AXObjectCache* cache = axObjectCache()) { |
| 3280 cache->remove(scrollbar); | 3280 cache->remove(scrollbar); |
| 3281 cache->handleScrollbarUpdate(this); | 3281 cache->handleScrollbarUpdate(this); |
| 3282 } | 3282 } |
| 3283 } | 3283 } |
| 3284 | 3284 |
| 3285 } // namespace WebCore | 3285 } // namespace WebCore |
| OLD | NEW |