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

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

Issue 16679011: Add viewport scrollbar class to support overlay scrollbars for pinch zoom virtual viewport. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
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.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <stack> 8 #include <stack>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 700 matching lines...) Expand 10 before | Expand all | Expand 10 after
711 ResourceUpdateQueue* queue) { 711 ResourceUpdateQueue* queue) {
712 TRACE_EVENT1("cc", "LayerTreeHost::UpdateLayers", 712 TRACE_EVENT1("cc", "LayerTreeHost::UpdateLayers",
713 "commit_number", commit_number()); 713 "commit_number", commit_number());
714 714
715 LayerList update_list; 715 LayerList update_list;
716 { 716 {
717 UpdateHudLayer(); 717 UpdateHudLayer();
718 718
719 Layer* root_scroll = FindFirstScrollableLayer(root_layer); 719 Layer* root_scroll = FindFirstScrollableLayer(root_layer);
720 720
721 // TODO(wjmaclean): when settings().use_pinch_virtual_viewport is specified,
722 // pass the page_scale_layer instead of root scroll layer for the page
723 // scale application layer in the following call.
721 TRACE_EVENT0("cc", "LayerTreeHost::UpdateLayers::CalcDrawProps"); 724 TRACE_EVENT0("cc", "LayerTreeHost::UpdateLayers::CalcDrawProps");
722 LayerTreeHostCommon::CalculateDrawProperties( 725 LayerTreeHostCommon::CalculateDrawProperties(
723 root_layer, 726 root_layer,
724 device_viewport_size(), 727 device_viewport_size(),
725 gfx::Transform(), 728 gfx::Transform(),
726 device_scale_factor_, 729 device_scale_factor_,
727 page_scale_factor_, 730 page_scale_factor_,
728 root_scroll, 731 root_scroll,
729 GetRendererCapabilities().max_texture_size, 732 GetRendererCapabilities().max_texture_size,
730 settings_.can_use_lcd_text, 733 settings_.can_use_lcd_text,
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
1080 bool start_ready_animations = true; 1083 bool start_ready_animations = true;
1081 (*iter).second->UpdateState(start_ready_animations, NULL); 1084 (*iter).second->UpdateState(start_ready_animations, NULL);
1082 } 1085 }
1083 } 1086 }
1084 1087
1085 skia::RefPtr<SkPicture> LayerTreeHost::CapturePicture() { 1088 skia::RefPtr<SkPicture> LayerTreeHost::CapturePicture() {
1086 return proxy_->CapturePicture(); 1089 return proxy_->CapturePicture();
1087 } 1090 }
1088 1091
1089 } // namespace cc 1092 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698