| OLD | NEW |
| 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 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 739 layer_settings.use_compositor_animation_timelines = | 739 layer_settings.use_compositor_animation_timelines = |
| 740 !command_line.HasSwitch(switches::kDisableCompositorAnimationTimelines); | 740 !command_line.HasSwitch(switches::kDisableCompositorAnimationTimelines); |
| 741 cc_blink::WebLayerImpl::SetLayerSettings(layer_settings); | 741 cc_blink::WebLayerImpl::SetLayerSettings(layer_settings); |
| 742 cc::SetClientNameForMetrics("Renderer"); | 742 cc::SetClientNameForMetrics("Renderer"); |
| 743 | 743 |
| 744 is_threaded_animation_enabled_ = | 744 is_threaded_animation_enabled_ = |
| 745 !command_line.HasSwitch(cc::switches::kDisableThreadedAnimation); | 745 !command_line.HasSwitch(cc::switches::kDisableThreadedAnimation); |
| 746 | 746 |
| 747 is_zero_copy_enabled_ = command_line.HasSwitch(switches::kEnableZeroCopy); | 747 is_zero_copy_enabled_ = command_line.HasSwitch(switches::kEnableZeroCopy); |
| 748 is_partial_raster_enabled_ = | 748 is_partial_raster_enabled_ = |
| 749 command_line.HasSwitch(switches::kEnablePartialRaster); | 749 !command_line.HasSwitch(switches::kDisablePartialRaster); |
| 750 is_gpu_memory_buffer_compositor_resources_enabled_ = command_line.HasSwitch( | 750 is_gpu_memory_buffer_compositor_resources_enabled_ = command_line.HasSwitch( |
| 751 switches::kEnableGpuMemoryBufferCompositorResources); | 751 switches::kEnableGpuMemoryBufferCompositorResources); |
| 752 | 752 |
| 753 #if defined(OS_MACOSX) && !defined(OS_IOS) | 753 #if defined(OS_MACOSX) && !defined(OS_IOS) |
| 754 is_elastic_overscroll_enabled_ = base::mac::IsOSLionOrLater(); | 754 is_elastic_overscroll_enabled_ = base::mac::IsOSLionOrLater(); |
| 755 if (is_elastic_overscroll_enabled_) { | 755 if (is_elastic_overscroll_enabled_) { |
| 756 base::ScopedCFTypeRef<CFStringRef> key( | 756 base::ScopedCFTypeRef<CFStringRef> key( |
| 757 base::SysUTF8ToCFStringRef("NSScrollViewRubberbanding")); | 757 base::SysUTF8ToCFStringRef("NSScrollViewRubberbanding")); |
| 758 Boolean key_exists = false; | 758 Boolean key_exists = false; |
| 759 Boolean value = CFPreferencesGetAppBooleanValue( | 759 Boolean value = CFPreferencesGetAppBooleanValue( |
| (...skipping 1411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2171 } | 2171 } |
| 2172 | 2172 |
| 2173 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2173 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
| 2174 size_t erased = | 2174 size_t erased = |
| 2175 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2175 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
| 2176 routing_id_); | 2176 routing_id_); |
| 2177 DCHECK_EQ(1u, erased); | 2177 DCHECK_EQ(1u, erased); |
| 2178 } | 2178 } |
| 2179 | 2179 |
| 2180 } // namespace content | 2180 } // namespace content |
| OLD | NEW |