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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 #include "core/layout/compositing/PaintLayerCompositor.h" | 71 #include "core/layout/compositing/PaintLayerCompositor.h" |
72 #include "core/layout/svg/LayoutSVGRoot.h" | 72 #include "core/layout/svg/LayoutSVGRoot.h" |
73 #include "core/loader/FrameLoader.h" | 73 #include "core/loader/FrameLoader.h" |
74 #include "core/loader/FrameLoaderClient.h" | 74 #include "core/loader/FrameLoaderClient.h" |
75 #include "core/page/AutoscrollController.h" | 75 #include "core/page/AutoscrollController.h" |
76 #include "core/page/ChromeClient.h" | 76 #include "core/page/ChromeClient.h" |
77 #include "core/page/FocusController.h" | 77 #include "core/page/FocusController.h" |
78 #include "core/page/FrameTree.h" | 78 #include "core/page/FrameTree.h" |
79 #include "core/page/Page.h" | 79 #include "core/page/Page.h" |
80 #include "core/page/scrolling/ScrollingCoordinator.h" | 80 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 81 #include "core/page/scrolling/SnapCoordinator.h" |
81 #include "core/paint/FramePainter.h" | 82 #include "core/paint/FramePainter.h" |
82 #include "core/paint/PaintLayer.h" | 83 #include "core/paint/PaintLayer.h" |
83 #include "core/paint/PaintPropertyTreeBuilder.h" | 84 #include "core/paint/PaintPropertyTreeBuilder.h" |
84 #include "core/plugins/PluginView.h" | 85 #include "core/plugins/PluginView.h" |
85 #include "core/style/ComputedStyle.h" | 86 #include "core/style/ComputedStyle.h" |
86 #include "core/svg/SVGDocumentExtensions.h" | 87 #include "core/svg/SVGDocumentExtensions.h" |
87 #include "core/svg/SVGSVGElement.h" | 88 #include "core/svg/SVGSVGElement.h" |
88 #include "platform/Histogram.h" | 89 #include "platform/Histogram.h" |
89 #include "platform/HostWindow.h" | 90 #include "platform/HostWindow.h" |
90 #include "platform/RuntimeEnabledFeatures.h" | 91 #include "platform/RuntimeEnabledFeatures.h" |
(...skipping 2344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2435 | 2436 |
2436 if (phases == OnlyUpToLayoutClean) { | 2437 if (phases == OnlyUpToLayoutClean) { |
2437 updateViewportIntersectionsForSubtree(phases); | 2438 updateViewportIntersectionsForSubtree(phases); |
2438 return; | 2439 return; |
2439 } | 2440 } |
2440 | 2441 |
2441 if (LayoutViewItem view = layoutViewItem()) { | 2442 if (LayoutViewItem view = layoutViewItem()) { |
2442 { | 2443 { |
2443 TRACE_EVENT1("devtools.timeline", "UpdateLayerTree", "data", Inspect
orUpdateLayerTreeEvent::data(m_frame.get())); | 2444 TRACE_EVENT1("devtools.timeline", "UpdateLayerTree", "data", Inspect
orUpdateLayerTreeEvent::data(m_frame.get())); |
2444 | 2445 |
| 2446 if (SnapCoordinator* snapCoordinator = frame().document()->snapCoord
inator()) |
| 2447 snapCoordinator->notifyLayoutUpdated(); |
| 2448 |
2445 // This was required for slimming paint v1 but is only temporarily | 2449 // This was required for slimming paint v1 but is only temporarily |
2446 // needed for slimming paint v2. | 2450 // needed for slimming paint v2. |
2447 view.compositor()->updateIfNeededRecursive(); | 2451 view.compositor()->updateIfNeededRecursive(); |
2448 scrollContentsIfNeededRecursive(); | 2452 scrollContentsIfNeededRecursive(); |
2449 | 2453 |
2450 ASSERT(lifecycle().state() >= DocumentLifecycle::CompositingClean); | 2454 ASSERT(lifecycle().state() >= DocumentLifecycle::CompositingClean); |
2451 | 2455 |
2452 if (phases == AllPhases || phases == AllPhasesExceptPaint) { | 2456 if (phases == AllPhases || phases == AllPhasesExceptPaint) { |
2453 invalidateTreeIfNeededRecursive(); | 2457 invalidateTreeIfNeededRecursive(); |
2454 | 2458 |
(...skipping 1660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4115 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot
tling); | 4119 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot
tling); |
4116 } | 4120 } |
4117 | 4121 |
4118 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const | 4122 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const |
4119 { | 4123 { |
4120 ASSERT(!layoutViewItem().isNull()); | 4124 ASSERT(!layoutViewItem().isNull()); |
4121 return *layoutView(); | 4125 return *layoutView(); |
4122 } | 4126 } |
4123 | 4127 |
4124 } // namespace blink | 4128 } // namespace blink |
OLD | NEW |