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

Side by Side Diff: cc/trees/layer_tree_host_impl.cc

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
« no previous file with comments | « no previous file | content/browser/renderer_host/input/input_router_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/layer_tree_host_impl.h" 5 #include "cc/trees/layer_tree_host_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 2985 matching lines...) Expand 10 before | Expand all | Expand 10 after
2996 bool is_viewport_scroll_layer = 2996 bool is_viewport_scroll_layer =
2997 viewport()->MainScrollLayer() && 2997 viewport()->MainScrollLayer() &&
2998 scroll_node->owning_layer_id == viewport()->MainScrollLayer()->id(); 2998 scroll_node->owning_layer_id == viewport()->MainScrollLayer()->id();
2999 2999
3000 // This is needed if the scroll chains up to the viewport without going 3000 // This is needed if the scroll chains up to the viewport without going
3001 // through the outer viewport scroll layer. This can happen if we scroll an 3001 // through the outer viewport scroll layer. This can happen if we scroll an
3002 // element that's not a descendant of the document.rootScroller. In that case 3002 // element that's not a descendant of the document.rootScroller. In that case
3003 // we want to scroll the inner viewport -- to allow panning while zoomed -- 3003 // we want to scroll the inner viewport -- to allow panning while zoomed --
3004 // but also move browser controls if needed. 3004 // but also move browser controls if needed.
3005 bool is_inner_viewport_scroll_layer = 3005 bool is_inner_viewport_scroll_layer =
3006 InnerViewportScrollLayer() &&
3007 scroll_node->owning_layer_id == InnerViewportScrollLayer()->id(); 3006 scroll_node->owning_layer_id == InnerViewportScrollLayer()->id();
3008 3007
3009 if (is_viewport_scroll_layer || is_inner_viewport_scroll_layer) { 3008 if (is_viewport_scroll_layer || is_inner_viewport_scroll_layer) {
3010 Viewport::ScrollResult result = viewport()->ScrollBy( 3009 Viewport::ScrollResult result = viewport()->ScrollBy(
3011 delta, viewport_point, scroll_state->is_direct_manipulation(), 3010 delta, viewport_point, scroll_state->is_direct_manipulation(),
3012 !wheel_scrolling_, is_viewport_scroll_layer); 3011 !wheel_scrolling_, is_viewport_scroll_layer);
3013 3012
3014 applied_delta = result.consumed_delta; 3013 applied_delta = result.consumed_delta;
3015 delta_applied_to_content = result.content_scrolled_delta; 3014 delta_applied_to_content = result.content_scrolled_delta;
3016 } else { 3015 } else {
(...skipping 1078 matching lines...) Expand 10 before | Expand all | Expand 10 after
4095 worker_context_visibility_ = 4094 worker_context_visibility_ =
4096 worker_context->CacheController()->ClientBecameVisible(); 4095 worker_context->CacheController()->ClientBecameVisible();
4097 } else { 4096 } else {
4098 worker_context->CacheController()->ClientBecameNotVisible( 4097 worker_context->CacheController()->ClientBecameNotVisible(
4099 std::move(worker_context_visibility_)); 4098 std::move(worker_context_visibility_));
4100 } 4099 }
4101 } 4100 }
4102 } 4101 }
4103 4102
4104 } // namespace cc 4103 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/input/input_router_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698