Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2113483002: Make RootScroller set the outer viewport scroll layer in the compositor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: RootScroller changes outer viewport scroll layer Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 #include "core/layout/compositing/PaintLayerCompositor.h" 72 #include "core/layout/compositing/PaintLayerCompositor.h"
73 #include "core/layout/svg/LayoutSVGRoot.h" 73 #include "core/layout/svg/LayoutSVGRoot.h"
74 #include "core/loader/FrameLoader.h" 74 #include "core/loader/FrameLoader.h"
75 #include "core/loader/FrameLoaderClient.h" 75 #include "core/loader/FrameLoaderClient.h"
76 #include "core/page/AutoscrollController.h" 76 #include "core/page/AutoscrollController.h"
77 #include "core/page/ChromeClient.h" 77 #include "core/page/ChromeClient.h"
78 #include "core/page/FocusController.h" 78 #include "core/page/FocusController.h"
79 #include "core/page/FrameTree.h" 79 #include "core/page/FrameTree.h"
80 #include "core/page/Page.h" 80 #include "core/page/Page.h"
81 #include "core/page/scrolling/ChildViewportScrollCallback.h" 81 #include "core/page/scrolling/ChildViewportScrollCallback.h"
82 #include "core/page/scrolling/RootScrollerController.h"
82 #include "core/page/scrolling/RootViewportScrollCallback.h" 83 #include "core/page/scrolling/RootViewportScrollCallback.h"
83 #include "core/page/scrolling/ScrollingCoordinator.h" 84 #include "core/page/scrolling/ScrollingCoordinator.h"
84 #include "core/paint/FramePainter.h" 85 #include "core/paint/FramePainter.h"
85 #include "core/paint/PaintLayer.h" 86 #include "core/paint/PaintLayer.h"
86 #include "core/paint/PrePaintTreeWalk.h" 87 #include "core/paint/PrePaintTreeWalk.h"
87 #include "core/plugins/PluginView.h" 88 #include "core/plugins/PluginView.h"
88 #include "core/style/ComputedStyle.h" 89 #include "core/style/ComputedStyle.h"
89 #include "core/svg/SVGDocumentExtensions.h" 90 #include "core/svg/SVGDocumentExtensions.h"
90 #include "core/svg/SVGSVGElement.h" 91 #include "core/svg/SVGSVGElement.h"
91 #include "platform/Histogram.h" 92 #include "platform/Histogram.h"
(...skipping 2448 matching lines...) Expand 10 before | Expand all | Expand 10 after
2540 2541
2541 DCHECK(lifecycle().state() >= DocumentLifecycle::CompositingClean); 2542 DCHECK(lifecycle().state() >= DocumentLifecycle::CompositingClean);
2542 2543
2543 if (targetState >= DocumentLifecycle::PrePaintClean) { 2544 if (targetState >= DocumentLifecycle::PrePaintClean) {
2544 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) 2545 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
2545 invalidateTreeIfNeededRecursive(); 2546 invalidateTreeIfNeededRecursive();
2546 2547
2547 if (view.compositor()->inCompositingMode()) 2548 if (view.compositor()->inCompositingMode())
2548 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded (); 2549 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded ();
2549 2550
2551 m_frame->document()->rootScrollerController()->didUpdateComposit ing();
2550 updateCompositedSelectionIfNeeded(); 2552 updateCompositedSelectionIfNeeded();
2551 } 2553 }
2552 } 2554 }
2553 2555
2554 if (targetState >= DocumentLifecycle::PrePaintClean) { 2556 if (targetState >= DocumentLifecycle::PrePaintClean) {
2555 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) 2557 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
2556 updatePaintProperties(); 2558 updatePaintProperties();
2557 } 2559 }
2558 2560
2559 if (targetState == DocumentLifecycle::PaintClean) { 2561 if (targetState == DocumentLifecycle::PaintClean) {
(...skipping 1686 matching lines...) Expand 10 before | Expand all | Expand 10 after
4246 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling); 4248 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling);
4247 } 4249 }
4248 4250
4249 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4251 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4250 { 4252 {
4251 ASSERT(!layoutViewItem().isNull()); 4253 ASSERT(!layoutViewItem().isNull());
4252 return *layoutView(); 4254 return *layoutView();
4253 } 4255 }
4254 4256
4255 } // namespace blink 4257 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Element.cpp ('k') | third_party/WebKit/Source/core/input/ScrollManager.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698