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

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

Issue 714003002: Allow changing top controls height (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Some more fixes Created 6 years, 1 month 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 // 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 #include <string> 9 #include <string>
10 10
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 next_ui_resource_id_(1), 109 next_ui_resource_id_(1),
110 inside_begin_main_frame_(false), 110 inside_begin_main_frame_(false),
111 needs_full_tree_sync_(true), 111 needs_full_tree_sync_(true),
112 client_(client), 112 client_(client),
113 source_frame_number_(0), 113 source_frame_number_(0),
114 rendering_stats_instrumentation_(RenderingStatsInstrumentation::Create()), 114 rendering_stats_instrumentation_(RenderingStatsInstrumentation::Create()),
115 output_surface_lost_(true), 115 output_surface_lost_(true),
116 num_failed_recreate_attempts_(0), 116 num_failed_recreate_attempts_(0),
117 settings_(settings), 117 settings_(settings),
118 debug_state_(settings.initial_debug_state), 118 debug_state_(settings.initial_debug_state),
119 top_controls_layout_height_(0.f), 119 top_controls_shrink_blink_size_(false),
120 top_controls_height_(0.f),
120 top_controls_content_offset_(0.f), 121 top_controls_content_offset_(0.f),
121 device_scale_factor_(1.f), 122 device_scale_factor_(1.f),
122 visible_(true), 123 visible_(true),
123 page_scale_factor_(1.f), 124 page_scale_factor_(1.f),
124 min_page_scale_factor_(1.f), 125 min_page_scale_factor_(1.f),
125 max_page_scale_factor_(1.f), 126 max_page_scale_factor_(1.f),
126 has_gpu_rasterization_trigger_(false), 127 has_gpu_rasterization_trigger_(false),
127 content_is_suitable_for_gpu_rasterization_(true), 128 content_is_suitable_for_gpu_rasterization_(true),
128 gpu_rasterization_histogram_recorded_(false), 129 gpu_rasterization_histogram_recorded_(false),
129 background_color_(SK_ColorWHITE), 130 background_color_(SK_ColorWHITE),
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 float page_scale_delta = 362 float page_scale_delta =
362 sync_tree->page_scale_delta() / sync_tree->sent_page_scale_delta(); 363 sync_tree->page_scale_delta() / sync_tree->sent_page_scale_delta();
363 sync_tree->SetPageScaleValues(page_scale_factor_, 364 sync_tree->SetPageScaleValues(page_scale_factor_,
364 min_page_scale_factor_, 365 min_page_scale_factor_,
365 max_page_scale_factor_, 366 max_page_scale_factor_,
366 page_scale_delta); 367 page_scale_delta);
367 sync_tree->set_sent_page_scale_delta(1.f); 368 sync_tree->set_sent_page_scale_delta(1.f);
368 369
369 sync_tree->PassSwapPromises(&swap_promise_list_); 370 sync_tree->PassSwapPromises(&swap_promise_list_);
370 371
371 sync_tree->set_top_controls_layout_height(top_controls_layout_height_); 372 sync_tree->set_top_controls_shrink_blink_size(
373 top_controls_shrink_blink_size_);
374 sync_tree->set_top_controls_height(top_controls_height_);
372 sync_tree->set_top_controls_content_offset(top_controls_content_offset_); 375 sync_tree->set_top_controls_content_offset(top_controls_content_offset_);
373 sync_tree->set_top_controls_delta(sync_tree->top_controls_delta() - 376 sync_tree->set_top_controls_delta(sync_tree->top_controls_delta() -
374 sync_tree->sent_top_controls_delta()); 377 sync_tree->sent_top_controls_delta());
375 sync_tree->set_sent_top_controls_delta(0.f); 378 sync_tree->set_sent_top_controls_delta(0.f);
376 379
377 host_impl->SetUseGpuRasterization(UseGpuRasterization()); 380 host_impl->SetUseGpuRasterization(UseGpuRasterization());
378 RecordGpuRasterizationHistogram(); 381 RecordGpuRasterizationHistogram();
379 382
380 host_impl->SetViewportSize(device_viewport_size_); 383 host_impl->SetViewportSize(device_viewport_size_);
381 host_impl->SetDeviceScaleFactor(device_scale_factor_); 384 host_impl->SetDeviceScaleFactor(device_scale_factor_);
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 655
653 void LayerTreeHost::SetViewportSize(const gfx::Size& device_viewport_size) { 656 void LayerTreeHost::SetViewportSize(const gfx::Size& device_viewport_size) {
654 if (device_viewport_size == device_viewport_size_) 657 if (device_viewport_size == device_viewport_size_)
655 return; 658 return;
656 659
657 device_viewport_size_ = device_viewport_size; 660 device_viewport_size_ = device_viewport_size;
658 661
659 SetNeedsCommit(); 662 SetNeedsCommit();
660 } 663 }
661 664
662 void LayerTreeHost::SetTopControlsLayoutHeight(float height) { 665 void LayerTreeHost::SetTopControlsShrinkBlinkSize(bool shrink) {
663 if (top_controls_layout_height_ == height) 666 if (top_controls_shrink_blink_size_ == shrink)
664 return; 667 return;
665 668
666 top_controls_layout_height_ = height; 669 top_controls_shrink_blink_size_ = shrink;
667 SetNeedsCommit(); 670 SetNeedsCommit();
668 } 671 }
669 672
673 void LayerTreeHost::SetTopControlsHeight(float height) {
674 if (top_controls_height_ == height)
675 return;
676
677 top_controls_height_ = height;
678 SetNeedsCommit();
679 }
680
670 void LayerTreeHost::SetTopControlsContentOffset(float offset) { 681 void LayerTreeHost::SetTopControlsContentOffset(float offset) {
671 if (top_controls_content_offset_ == offset) 682 if (top_controls_content_offset_ == offset)
672 return; 683 return;
673 684
674 top_controls_content_offset_ = offset; 685 top_controls_content_offset_ = offset;
675 SetNeedsCommit(); 686 SetNeedsCommit();
676 } 687 }
677 688
678 void LayerTreeHost::ApplyPageScaleDeltaFromImplSide(float page_scale_delta) { 689 void LayerTreeHost::ApplyPageScaleDeltaFromImplSide(float page_scale_delta) {
679 DCHECK(CommitRequested()); 690 DCHECK(CommitRequested());
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
1346 1357
1347 void LayerTreeHost::set_surface_id_namespace(uint32_t id_namespace) { 1358 void LayerTreeHost::set_surface_id_namespace(uint32_t id_namespace) {
1348 surface_id_namespace_ = id_namespace; 1359 surface_id_namespace_ = id_namespace;
1349 } 1360 }
1350 1361
1351 SurfaceSequence LayerTreeHost::CreateSurfaceSequence() { 1362 SurfaceSequence LayerTreeHost::CreateSurfaceSequence() {
1352 return SurfaceSequence(surface_id_namespace_, next_surface_sequence_++); 1363 return SurfaceSequence(surface_id_namespace_, next_surface_sequence_++);
1353 } 1364 }
1354 1365
1355 } // namespace cc 1366 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698