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

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

Issue 2285253003: Move TopDocumentRootScrollerController to a separate object on FrameHost (Closed)
Patch Set: None Created 4 years, 3 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 #include "core/layout/svg/LayoutSVGRoot.h" 75 #include "core/layout/svg/LayoutSVGRoot.h"
76 #include "core/loader/DocumentLoader.h" 76 #include "core/loader/DocumentLoader.h"
77 #include "core/loader/FrameLoader.h" 77 #include "core/loader/FrameLoader.h"
78 #include "core/loader/FrameLoaderClient.h" 78 #include "core/loader/FrameLoaderClient.h"
79 #include "core/observer/ResizeObserverController.h" 79 #include "core/observer/ResizeObserverController.h"
80 #include "core/page/AutoscrollController.h" 80 #include "core/page/AutoscrollController.h"
81 #include "core/page/ChromeClient.h" 81 #include "core/page/ChromeClient.h"
82 #include "core/page/FocusController.h" 82 #include "core/page/FocusController.h"
83 #include "core/page/FrameTree.h" 83 #include "core/page/FrameTree.h"
84 #include "core/page/Page.h" 84 #include "core/page/Page.h"
85 #include "core/page/scrolling/RootScrollerController.h"
86 #include "core/page/scrolling/ScrollingCoordinator.h" 85 #include "core/page/scrolling/ScrollingCoordinator.h"
86 #include "core/page/scrolling/TopDocumentRootScrollerController.h"
87 #include "core/paint/FramePainter.h" 87 #include "core/paint/FramePainter.h"
88 #include "core/paint/PaintLayer.h" 88 #include "core/paint/PaintLayer.h"
89 #include "core/paint/PrePaintTreeWalk.h" 89 #include "core/paint/PrePaintTreeWalk.h"
90 #include "core/plugins/PluginView.h" 90 #include "core/plugins/PluginView.h"
91 #include "core/style/ComputedStyle.h" 91 #include "core/style/ComputedStyle.h"
92 #include "core/svg/SVGDocumentExtensions.h" 92 #include "core/svg/SVGDocumentExtensions.h"
93 #include "core/svg/SVGSVGElement.h" 93 #include "core/svg/SVGSVGElement.h"
94 #include "platform/Histogram.h" 94 #include "platform/Histogram.h"
95 #include "platform/HostWindow.h" 95 #include "platform/HostWindow.h"
96 #include "platform/JSONValues.h" 96 #include "platform/JSONValues.h"
(...skipping 2318 matching lines...) Expand 10 before | Expand all | Expand 10 after
2415 DCHECK(m_frame->document()); 2415 DCHECK(m_frame->document());
2416 2416
2417 if (m_frame->isMainFrame()) { 2417 if (m_frame->isMainFrame()) {
2418 ScrollableArea& visualViewport = frameHost->visualViewport(); 2418 ScrollableArea& visualViewport = frameHost->visualViewport();
2419 ScrollableArea* layoutViewport = layoutViewportScrollableArea(); 2419 ScrollableArea* layoutViewport = layoutViewportScrollableArea();
2420 DCHECK(layoutViewport); 2420 DCHECK(layoutViewport);
2421 2421
2422 RootFrameViewport* rootFrameViewport = 2422 RootFrameViewport* rootFrameViewport =
2423 RootFrameViewport::create(visualViewport, *layoutViewport); 2423 RootFrameViewport::create(visualViewport, *layoutViewport);
2424 m_viewportScrollableArea = rootFrameViewport; 2424 m_viewportScrollableArea = rootFrameViewport;
2425
2426 frameHost->globalRootScrollerController()
2427 .initializeViewportScrollCallback(*rootFrameViewport);
2425 } 2428 }
2426 } 2429 }
2427 2430
2428 void FrameView::updateScrollCorner() 2431 void FrameView::updateScrollCorner()
2429 { 2432 {
2430 RefPtr<ComputedStyle> cornerStyle; 2433 RefPtr<ComputedStyle> cornerStyle;
2431 IntRect cornerRect = scrollCornerRect(); 2434 IntRect cornerRect = scrollCornerRect();
2432 Document* doc = m_frame->document(); 2435 Document* doc = m_frame->document();
2433 2436
2434 if (doc && !cornerRect.isEmpty()) { 2437 if (doc && !cornerRect.isEmpty()) {
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
2606 { 2609 {
2607 TRACE_EVENT1("devtools.timeline", "UpdateLayerTree", "data", Inspect orUpdateLayerTreeEvent::data(m_frame.get())); 2610 TRACE_EVENT1("devtools.timeline", "UpdateLayerTree", "data", Inspect orUpdateLayerTreeEvent::data(m_frame.get()));
2608 2611
2609 // This was required for slimming paint v1 but is only temporarily 2612 // This was required for slimming paint v1 but is only temporarily
2610 // needed for slimming paint v2. 2613 // needed for slimming paint v2.
2611 view.compositor()->updateIfNeededRecursive(); 2614 view.compositor()->updateIfNeededRecursive();
2612 scrollContentsIfNeededRecursive(); 2615 scrollContentsIfNeededRecursive();
2613 2616
2614 DCHECK(lifecycle().state() >= DocumentLifecycle::CompositingClean); 2617 DCHECK(lifecycle().state() >= DocumentLifecycle::CompositingClean);
2615 2618
2619 m_frame->host()->globalRootScrollerController().didUpdateCompositing ();
2620
2616 if (targetState >= DocumentLifecycle::PrePaintClean) { 2621 if (targetState >= DocumentLifecycle::PrePaintClean) {
2617 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) 2622 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
2618 invalidateTreeIfNeededRecursive(); 2623 invalidateTreeIfNeededRecursive();
2619 2624
2620 if (view.compositor()->inCompositingMode()) 2625 if (view.compositor()->inCompositingMode())
2621 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded (); 2626 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded ();
2622 2627
2623 updateCompositedSelectionIfNeeded(); 2628 updateCompositedSelectionIfNeeded();
2624 } 2629 }
2625 } 2630 }
(...skipping 1695 matching lines...) Expand 10 before | Expand all | Expand 10 after
4321 } 4326 }
4322 4327
4323 bool FrameView::canThrottleRendering() const 4328 bool FrameView::canThrottleRendering() const
4324 { 4329 {
4325 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled()) 4330 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled())
4326 return false; 4331 return false;
4327 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling); 4332 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling);
4328 } 4333 }
4329 4334
4330 } // namespace blink 4335 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698