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