From 5717896b5d51f52dba886eb4d3a3c7bc33ecb14e Mon Sep 17 00:00:00 2001 From: "piman@chromium.org" Date: Thu, 24 Apr 2014 08:52:35 +0000 Subject: Remove WebPreferences::accelerated_compositing_enabled After https://codereview.chromium.org/238933009/ and https://codereview.chromium.org/234443002/ the only place accelerated_compositing_enabled is set to false is either: 1- the GPU crashed too many times (including with SwiftShader), but that gets overriden to true by GpuDataManagerImpl::UpdateRendererWebPrefs anyway. 2- on a guest renderer if the parent also has it false, but that can't happen because of 1. Disabling compositing doesn't work anymore in any case, so we shouldn't do it either way. BUG=363772 Review URL: https://codereview.chromium.org/236363019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265892 0039d316-1c4b-4281-b951-d872f2087c98 --- content/renderer/renderer_webkitplatformsupport_impl.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'content/renderer/renderer_webkitplatformsupport_impl.cc') diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index aa46b53..b507a73 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -669,7 +669,9 @@ bool RendererWebKitPlatformSupportImpl::canAccelerate2dCanvas() { } bool RendererWebKitPlatformSupportImpl::isThreadedCompositingEnabled() { - return !!RenderThreadImpl::current()->compositor_message_loop_proxy().get(); + RenderThreadImpl* thread = RenderThreadImpl::current(); + // thread can be NULL in tests. + return thread && thread->compositor_message_loop_proxy().get(); } double RendererWebKitPlatformSupportImpl::audioHardwareSampleRate() { -- cgit v1.1