| 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 <vector> | 10 #include <vector> |
| (...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 597 DCHECK_GE(gpu_rasterization_msaa_sample_count_, 0); | 597 DCHECK_GE(gpu_rasterization_msaa_sample_count_, 0); |
| 598 } else { | 598 } else { |
| 599 gpu_rasterization_msaa_sample_count_ = 0; | 599 gpu_rasterization_msaa_sample_count_ = 0; |
| 600 } | 600 } |
| 601 | 601 |
| 602 if (command_line.HasSwitch(switches::kDisableDistanceFieldText)) { | 602 if (command_line.HasSwitch(switches::kDisableDistanceFieldText)) { |
| 603 is_distance_field_text_enabled_ = false; | 603 is_distance_field_text_enabled_ = false; |
| 604 } else if (command_line.HasSwitch(switches::kEnableDistanceFieldText)) { | 604 } else if (command_line.HasSwitch(switches::kEnableDistanceFieldText)) { |
| 605 is_distance_field_text_enabled_ = true; | 605 is_distance_field_text_enabled_ = true; |
| 606 } else { | 606 } else { |
| 607 #if defined(OS_ANDROID) | |
| 608 is_distance_field_text_enabled_ = true; | |
| 609 #else | |
| 610 is_distance_field_text_enabled_ = false; | 607 is_distance_field_text_enabled_ = false; |
| 611 #endif | |
| 612 } | 608 } |
| 613 | 609 |
| 614 // Note that under Linux, the media library will normally already have | 610 // Note that under Linux, the media library will normally already have |
| 615 // been initialized by the Zygote before this instance became a Renderer. | 611 // been initialized by the Zygote before this instance became a Renderer. |
| 616 base::FilePath media_path; | 612 base::FilePath media_path; |
| 617 PathService::Get(DIR_MEDIA_LIBS, &media_path); | 613 PathService::Get(DIR_MEDIA_LIBS, &media_path); |
| 618 if (!media_path.empty()) | 614 if (!media_path.empty()) |
| 619 media::InitializeMediaLibrary(media_path); | 615 media::InitializeMediaLibrary(media_path); |
| 620 | 616 |
| 621 memory_pressure_listener_.reset(new base::MemoryPressureListener( | 617 memory_pressure_listener_.reset(new base::MemoryPressureListener( |
| (...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1813 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 1809 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
| 1814 mojo::ServiceProviderPtr exposed_services) | 1810 mojo::ServiceProviderPtr exposed_services) |
| 1815 : services(services.Pass()), | 1811 : services(services.Pass()), |
| 1816 exposed_services(exposed_services.Pass()) { | 1812 exposed_services(exposed_services.Pass()) { |
| 1817 } | 1813 } |
| 1818 | 1814 |
| 1819 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() { | 1815 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() { |
| 1820 } | 1816 } |
| 1821 | 1817 |
| 1822 } // namespace content | 1818 } // namespace content |
| OLD | NEW |