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

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

Issue 2479663002: Move compositor InputHandler from RenderViewImpl to RenderWidget. (Closed)
Patch Set: Rebase to master@{#445291}. 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 2934 matching lines...) Expand 10 before | Expand all | Expand 10 after
2945 2945
2946 if (targetState >= DocumentLifecycle::PrePaintClean) { 2946 if (targetState >= DocumentLifecycle::PrePaintClean) {
2947 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) 2947 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
2948 invalidateTreeIfNeededRecursive(); 2948 invalidateTreeIfNeededRecursive();
2949 2949
2950 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { 2950 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
2951 if (view.compositor()->inCompositingMode()) 2951 if (view.compositor()->inCompositingMode())
2952 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded(); 2952 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded();
2953 } 2953 }
2954 2954
2955 if (LocalFrame* localFrame = m_frame->localFrameRoot()) {
2956 // This is needed since, at present, the ScrollingCoordinator doesn't
2957 // send rects for oopif sub-frames.
2958 // TODO(wjmaclean): Remove this pathway when ScrollingCoordinator
2959 // operates on a per-frame basis. https://crbug.com/680606
2960 frame().page()->chromeClient().updateTouchRectsForSubframeIfNecessary(
2961 localFrame);
2962 }
2955 updateCompositedSelectionIfNeeded(); 2963 updateCompositedSelectionIfNeeded();
2956 } 2964 }
2957 2965
2958 // TODO(pdr): prePaint should be under the "Paint" devtools timeline step 2966 // TODO(pdr): prePaint should be under the "Paint" devtools timeline step
2959 // for slimming paint v2. 2967 // for slimming paint v2.
2960 if (targetState >= DocumentLifecycle::PrePaintClean) 2968 if (targetState >= DocumentLifecycle::PrePaintClean)
2961 prePaint(); 2969 prePaint();
2962 } 2970 }
2963 2971
2964 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) 2972 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
(...skipping 2061 matching lines...) Expand 10 before | Expand all | Expand 10 after
5026 std::unique_ptr<CompositorAnimationTimeline> timeline) { 5034 std::unique_ptr<CompositorAnimationTimeline> timeline) {
5027 m_animationTimeline = std::move(timeline); 5035 m_animationTimeline = std::move(timeline);
5028 } 5036 }
5029 5037
5030 void FrameView::setAnimationHost( 5038 void FrameView::setAnimationHost(
5031 std::unique_ptr<CompositorAnimationHost> host) { 5039 std::unique_ptr<CompositorAnimationHost> host) {
5032 m_animationHost = std::move(host); 5040 m_animationHost = std::move(host);
5033 } 5041 }
5034 5042
5035 } // namespace blink 5043 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698