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

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

Issue 1251693003: cc: Fix the format of GpuMemoryBuffer for SurfaceTexture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change switches::kContentImageTextureTarget to a list of image texture targets Created 5 years, 4 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 // 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_settings.h" 5 #include "cc/trees/layer_tree_settings.h"
6 6
7 #include <GLES2/gl2.h> 7 #include <GLES2/gl2.h>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "ui/gfx/gpu_memory_buffer.h"
13 14
14 namespace cc { 15 namespace cc {
15 16
16 LayerSettings::LayerSettings() : use_compositor_animation_timelines(false) { 17 LayerSettings::LayerSettings() : use_compositor_animation_timelines(false) {
17 } 18 }
18 19
19 LayerSettings::~LayerSettings() { 20 LayerSettings::~LayerSettings() {
20 } 21 }
21 22
22 LayerTreeSettings::LayerTreeSettings() 23 LayerTreeSettings::LayerTreeSettings()
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 max_tiles_for_interest_area(128), 57 max_tiles_for_interest_area(128),
57 skewport_target_time_in_seconds(1.0f), 58 skewport_target_time_in_seconds(1.0f),
58 skewport_extrapolation_limit_in_content_pixels(2000), 59 skewport_extrapolation_limit_in_content_pixels(2000),
59 max_unused_resource_memory_percentage(100), 60 max_unused_resource_memory_percentage(100),
60 max_memory_for_prepaint_percentage(100), 61 max_memory_for_prepaint_percentage(100),
61 strict_layer_property_change_checking(false), 62 strict_layer_property_change_checking(false),
62 use_one_copy(true), 63 use_one_copy(true),
63 use_zero_copy(false), 64 use_zero_copy(false),
64 use_persistent_map_for_gpu_memory_buffers(false), 65 use_persistent_map_for_gpu_memory_buffers(false),
65 enable_elastic_overscroll(false), 66 enable_elastic_overscroll(false),
66 use_image_texture_target(GL_TEXTURE_2D), 67 use_image_texture_targets(gfx::GpuMemoryBuffer::FORMAT_LAST + 1,
68 GL_TEXTURE_2D),
67 ignore_root_layer_flings(false), 69 ignore_root_layer_flings(false),
68 scheduled_raster_task_limit(32), 70 scheduled_raster_task_limit(32),
69 use_occlusion_for_tile_prioritization(false), 71 use_occlusion_for_tile_prioritization(false),
70 record_full_layer(false), 72 record_full_layer(false),
71 use_display_lists(false), 73 use_display_lists(false),
72 verify_property_trees(false), 74 verify_property_trees(false),
73 gather_pixel_refs(false), 75 gather_pixel_refs(false),
74 use_compositor_animation_timelines(false), 76 use_compositor_animation_timelines(false),
75 invert_viewport_scroll_order(false), 77 invert_viewport_scroll_order(false),
76 wait_for_beginframe_interval(true) { 78 wait_for_beginframe_interval(true) {}
77 }
78 79
79 LayerTreeSettings::~LayerTreeSettings() {} 80 LayerTreeSettings::~LayerTreeSettings() {}
80 81
81 SchedulerSettings LayerTreeSettings::ToSchedulerSettings() const { 82 SchedulerSettings LayerTreeSettings::ToSchedulerSettings() const {
82 SchedulerSettings scheduler_settings; 83 SchedulerSettings scheduler_settings;
83 scheduler_settings.use_external_begin_frame_source = 84 scheduler_settings.use_external_begin_frame_source =
84 use_external_begin_frame_source; 85 use_external_begin_frame_source;
85 scheduler_settings.main_frame_before_activation_enabled = 86 scheduler_settings.main_frame_before_activation_enabled =
86 main_frame_before_activation_enabled; 87 main_frame_before_activation_enabled;
87 scheduler_settings.timeout_and_draw_when_animation_checkerboards = 88 scheduler_settings.timeout_and_draw_when_animation_checkerboards =
88 timeout_and_draw_when_animation_checkerboards; 89 timeout_and_draw_when_animation_checkerboards;
89 scheduler_settings.using_synchronous_renderer_compositor = 90 scheduler_settings.using_synchronous_renderer_compositor =
90 using_synchronous_renderer_compositor; 91 using_synchronous_renderer_compositor;
91 scheduler_settings.throttle_frame_production = wait_for_beginframe_interval; 92 scheduler_settings.throttle_frame_production = wait_for_beginframe_interval;
92 scheduler_settings.background_frame_interval = 93 scheduler_settings.background_frame_interval =
93 base::TimeDelta::FromSecondsD(1.0 / background_animation_rate); 94 base::TimeDelta::FromSecondsD(1.0 / background_animation_rate);
94 return scheduler_settings; 95 return scheduler_settings;
95 } 96 }
96 97
97 } // namespace cc 98 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698