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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 1739743003: Blink Compositor Animation: Erase old animation system. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compilation. Created 4 years, 9 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 (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/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <utility> 10 #include <utility>
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 729
730 GetContentClient()->renderer()->RenderThreadStarted(); 730 GetContentClient()->renderer()->RenderThreadStarted();
731 731
732 InitSkiaEventTracer(); 732 InitSkiaEventTracer();
733 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( 733 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
734 skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr); 734 skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr);
735 735
736 const base::CommandLine& command_line = 736 const base::CommandLine& command_line =
737 *base::CommandLine::ForCurrentProcess(); 737 *base::CommandLine::ForCurrentProcess();
738 738
739 cc::LayerSettings layer_settings;
740 layer_settings.use_compositor_animation_timelines =
741 !command_line.HasSwitch(switches::kDisableCompositorAnimationTimelines);
742 cc_blink::WebLayerImpl::SetLayerSettings(layer_settings);
743 cc::SetClientNameForMetrics("Renderer"); 739 cc::SetClientNameForMetrics("Renderer");
744 740
745 is_threaded_animation_enabled_ = 741 is_threaded_animation_enabled_ =
746 !command_line.HasSwitch(cc::switches::kDisableThreadedAnimation); 742 !command_line.HasSwitch(cc::switches::kDisableThreadedAnimation);
747 743
748 is_zero_copy_enabled_ = command_line.HasSwitch(switches::kEnableZeroCopy); 744 is_zero_copy_enabled_ = command_line.HasSwitch(switches::kEnableZeroCopy);
749 is_partial_raster_enabled_ = 745 is_partial_raster_enabled_ =
750 command_line.HasSwitch(switches::kEnablePartialRaster); 746 command_line.HasSwitch(switches::kEnablePartialRaster);
751 is_gpu_memory_buffer_compositor_resources_enabled_ = command_line.HasSwitch( 747 is_gpu_memory_buffer_compositor_resources_enabled_ = command_line.HasSwitch(
752 switches::kEnableGpuMemoryBufferCompositorResources); 748 switches::kEnableGpuMemoryBufferCompositorResources);
(...skipping 1423 matching lines...) Expand 10 before | Expand all | Expand 10 after
2176 } 2172 }
2177 2173
2178 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 2174 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
2179 size_t erased = 2175 size_t erased =
2180 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 2176 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
2181 routing_id_); 2177 routing_id_);
2182 DCHECK_EQ(1u, erased); 2178 DCHECK_EQ(1u, erased);
2183 } 2179 }
2184 2180
2185 } // namespace content 2181 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698