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

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

Issue 2649573003: Revert of Move compositor InputHandler from RenderViewImpl to RenderWidget. (Closed)
Patch Set: Created 3 years, 11 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 2930 matching lines...) Expand 10 before | Expand all | Expand 10 after
2941 2941
2942 if (targetState >= DocumentLifecycle::PrePaintClean) { 2942 if (targetState >= DocumentLifecycle::PrePaintClean) {
2943 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) 2943 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
2944 invalidateTreeIfNeededRecursive(); 2944 invalidateTreeIfNeededRecursive();
2945 2945
2946 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { 2946 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
2947 if (view.compositor()->inCompositingMode()) 2947 if (view.compositor()->inCompositingMode())
2948 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded(); 2948 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded();
2949 } 2949 }
2950 2950
2951 if (LocalFrame* localFrame = m_frame->localFrameRoot()) {
2952 // This is needed since, at present, the ScrollingCoordinator doesn't
2953 // send rects for oopif sub-frames.
2954 // TODO(wjmaclean): Remove this pathway when ScrollingCoordinator
2955 // operates on a per-frame basis. https://crbug.com/680606
2956 frame().page()->chromeClient().updateTouchRectsForSubframeIfNecessary(
2957 localFrame);
2958 }
2959 updateCompositedSelectionIfNeeded(); 2951 updateCompositedSelectionIfNeeded();
2960 } 2952 }
2961 2953
2962 // TODO(pdr): prePaint should be under the "Paint" devtools timeline step 2954 // TODO(pdr): prePaint should be under the "Paint" devtools timeline step
2963 // for slimming paint v2. 2955 // for slimming paint v2.
2964 if (targetState >= DocumentLifecycle::PrePaintClean) 2956 if (targetState >= DocumentLifecycle::PrePaintClean)
2965 prePaint(); 2957 prePaint();
2966 } 2958 }
2967 2959
2968 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) 2960 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
(...skipping 2057 matching lines...) Expand 10 before | Expand all | Expand 10 after
5026 std::unique_ptr<CompositorAnimationTimeline> timeline) { 5018 std::unique_ptr<CompositorAnimationTimeline> timeline) {
5027 m_animationTimeline = std::move(timeline); 5019 m_animationTimeline = std::move(timeline);
5028 } 5020 }
5029 5021
5030 void FrameView::setAnimationHost( 5022 void FrameView::setAnimationHost(
5031 std::unique_ptr<CompositorAnimationHost> host) { 5023 std::unique_ptr<CompositorAnimationHost> host) {
5032 m_animationHost = std::move(host); 5024 m_animationHost = std::move(host);
5033 } 5025 }
5034 5026
5035 } // namespace blink 5027 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698