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

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

Issue 1161183003: Revert "Chromium changes to statically link ffmpeg." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « cc/cc_unittests.isolate ('k') | cc/trees/layer_tree_host_unittest_context.cc » ('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 <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 on_can_draw_state_changed_called_(false), 93 on_can_draw_state_changed_called_(false),
94 did_notify_ready_to_activate_(false), 94 did_notify_ready_to_activate_(false),
95 did_request_commit_(false), 95 did_request_commit_(false),
96 did_request_redraw_(false), 96 did_request_redraw_(false),
97 did_request_animate_(false), 97 did_request_animate_(false),
98 did_request_prepare_tiles_(false), 98 did_request_prepare_tiles_(false),
99 did_complete_page_scale_animation_(false), 99 did_complete_page_scale_animation_(false),
100 reduce_memory_result_(true), 100 reduce_memory_result_(true),
101 current_limit_bytes_(0), 101 current_limit_bytes_(0),
102 current_priority_cutoff_value_(0) { 102 current_priority_cutoff_value_(0) {
103 media::InitializeMediaLibrary(); 103 media::InitializeMediaLibraryForTesting();
104 } 104 }
105 105
106 LayerTreeSettings DefaultSettings() { 106 LayerTreeSettings DefaultSettings() {
107 LayerTreeSettings settings; 107 LayerTreeSettings settings;
108 settings.minimum_occlusion_tracking_size = gfx::Size(); 108 settings.minimum_occlusion_tracking_size = gfx::Size();
109 settings.impl_side_painting = true; 109 settings.impl_side_painting = true;
110 settings.renderer_settings.texture_id_allocation_chunk_size = 1; 110 settings.renderer_settings.texture_id_allocation_chunk_size = 1;
111 settings.report_overscroll_only_for_scrollable_axes = true; 111 settings.report_overscroll_only_for_scrollable_axes = true;
112 settings.gpu_rasterization_enabled = true; 112 settings.gpu_rasterization_enabled = true;
113 return settings; 113 return settings;
(...skipping 7794 matching lines...) Expand 10 before | Expand all | Expand 10 after
7908 // Hold an unowned pointer to the output surface to use for mock expectations. 7908 // Hold an unowned pointer to the output surface to use for mock expectations.
7909 MockReclaimResourcesOutputSurface* mock_output_surface = output_surface.get(); 7909 MockReclaimResourcesOutputSurface* mock_output_surface = output_surface.get();
7910 7910
7911 CreateHostImpl(DefaultSettings(), output_surface.Pass()); 7911 CreateHostImpl(DefaultSettings(), output_surface.Pass());
7912 EXPECT_CALL(*mock_output_surface, ForceReclaimResources()).Times(1); 7912 EXPECT_CALL(*mock_output_surface, ForceReclaimResources()).Times(1);
7913 host_impl_->BeginCommit(); 7913 host_impl_->BeginCommit();
7914 } 7914 }
7915 7915
7916 } // namespace 7916 } // namespace
7917 } // namespace cc 7917 } // namespace cc
OLDNEW
« no previous file with comments | « cc/cc_unittests.isolate ('k') | cc/trees/layer_tree_host_unittest_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698