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

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

Issue 1308053006: CC Animations: Enable external animation host for blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Restore whitespace_file.txt Created 5 years 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 <vector> 10 #include <vector>
(...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 GetContentClient()->renderer()->RenderThreadStarted(); 661 GetContentClient()->renderer()->RenderThreadStarted();
662 662
663 InitSkiaEventTracer(); 663 InitSkiaEventTracer();
664 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( 664 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
665 skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr); 665 skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr);
666 666
667 const base::CommandLine& command_line = 667 const base::CommandLine& command_line =
668 *base::CommandLine::ForCurrentProcess(); 668 *base::CommandLine::ForCurrentProcess();
669 669
670 cc::LayerSettings layer_settings; 670 cc::LayerSettings layer_settings;
671 if (command_line.HasSwitch(switches::kEnableCompositorAnimationTimelines)) 671 layer_settings.use_compositor_animation_timelines =
672 layer_settings.use_compositor_animation_timelines = true; 672 !command_line.HasSwitch(switches::kDisableCompositorAnimationTimelines);
673 cc_blink::WebLayerImpl::SetLayerSettings(layer_settings); 673 cc_blink::WebLayerImpl::SetLayerSettings(layer_settings);
674 cc::SetClientNameForMetrics("Renderer"); 674 cc::SetClientNameForMetrics("Renderer");
675 675
676 is_threaded_animation_enabled_ = 676 is_threaded_animation_enabled_ =
677 !command_line.HasSwitch(cc::switches::kDisableThreadedAnimation); 677 !command_line.HasSwitch(cc::switches::kDisableThreadedAnimation);
678 678
679 is_zero_copy_enabled_ = command_line.HasSwitch(switches::kEnableZeroCopy); 679 is_zero_copy_enabled_ = command_line.HasSwitch(switches::kEnableZeroCopy);
680 is_partial_raster_enabled_ = 680 is_partial_raster_enabled_ =
681 command_line.HasSwitch(switches::kEnablePartialRaster); 681 command_line.HasSwitch(switches::kEnablePartialRaster);
682 is_gpu_memory_buffer_compositor_resources_enabled_ = command_line.HasSwitch( 682 is_gpu_memory_buffer_compositor_resources_enabled_ = command_line.HasSwitch(
(...skipping 1308 matching lines...) Expand 10 before | Expand all | Expand 10 after
1991 1991
1992 void RenderThreadImpl::ReleaseFreeMemory() { 1992 void RenderThreadImpl::ReleaseFreeMemory() {
1993 base::allocator::ReleaseFreeMemory(); 1993 base::allocator::ReleaseFreeMemory();
1994 discardable_shared_memory_manager()->ReleaseFreeMemory(); 1994 discardable_shared_memory_manager()->ReleaseFreeMemory();
1995 1995
1996 if (blink_platform_impl_) 1996 if (blink_platform_impl_)
1997 blink::decommitFreeableMemory(); 1997 blink::decommitFreeableMemory();
1998 } 1998 }
1999 1999
2000 } // namespace content 2000 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.cc ('k') | content/test/test_blink_web_unit_test_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698