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

Side by Side Diff: content/browser/renderer_host/compositor_impl_android.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/renderer_host/compositor_impl_android.h" 5 #include "content/browser/renderer_host/compositor_impl_android.h"
6 6
7 #include <android/bitmap.h> 7 #include <android/bitmap.h>
8 #include <android/native_window_jni.h> 8 #include <android/native_window_jni.h>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 } 408 }
409 } else if (!host_) { 409 } else if (!host_) {
410 DCHECK(!WillComposite()); 410 DCHECK(!WillComposite());
411 needs_composite_ = false; 411 needs_composite_ = false;
412 pending_swapbuffers_ = 0; 412 pending_swapbuffers_ = 0;
413 cc::LayerTreeSettings settings; 413 cc::LayerTreeSettings settings;
414 settings.refresh_rate = 60.0; 414 settings.refresh_rate = 60.0;
415 settings.impl_side_painting = false; 415 settings.impl_side_painting = false;
416 settings.allow_antialiasing = false; 416 settings.allow_antialiasing = false;
417 settings.calculate_top_controls_position = false; 417 settings.calculate_top_controls_position = false;
418 settings.top_controls_height = 0.f;
419 settings.highp_threshold_min = 2048; 418 settings.highp_threshold_min = 2048;
420 419
421 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 420 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
422 settings.initial_debug_state.SetRecordRenderingStats( 421 settings.initial_debug_state.SetRecordRenderingStats(
423 command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking)); 422 command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking));
424 settings.initial_debug_state.show_fps_counter = 423 settings.initial_debug_state.show_fps_counter =
425 command_line->HasSwitch(cc::switches::kUIShowFPSCounter); 424 command_line->HasSwitch(cc::switches::kUIShowFPSCounter);
426 // TODO(enne): Update this this compositor to use the scheduler. 425 // TODO(enne): Update this this compositor to use the scheduler.
427 settings.single_thread_proxy_scheduler = false; 426 settings.single_thread_proxy_scheduler = false;
428 427
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 } 668 }
670 669
671 void CompositorImpl::SetNeedsAnimate() { 670 void CompositorImpl::SetNeedsAnimate() {
672 if (!host_) 671 if (!host_)
673 return; 672 return;
674 673
675 host_->SetNeedsAnimate(); 674 host_->SetNeedsAnimate();
676 } 675 }
677 676
678 } // namespace content 677 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698