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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 #include <cpu-features.h> | 147 #include <cpu-features.h> |
148 #include "content/renderer/android/synchronous_compositor_factory.h" | 148 #include "content/renderer/android/synchronous_compositor_factory.h" |
149 #include "content/renderer/media/android/renderer_demuxer_android.h" | 149 #include "content/renderer/media/android/renderer_demuxer_android.h" |
150 #endif | 150 #endif |
151 | 151 |
152 #if defined(OS_MACOSX) | 152 #if defined(OS_MACOSX) |
153 #include "base/mac/mac_util.h" | 153 #include "base/mac/mac_util.h" |
154 #include "content/renderer/webscrollbarbehavior_impl_mac.h" | 154 #include "content/renderer/webscrollbarbehavior_impl_mac.h" |
155 #endif | 155 #endif |
156 | 156 |
| 157 #if defined(USE_OZONE) |
| 158 #include "ui/ozone/public/ozone_client.h" |
| 159 #endif |
| 160 |
157 #if defined(OS_POSIX) | 161 #if defined(OS_POSIX) |
158 #include "ipc/ipc_channel_posix.h" | 162 #include "ipc/ipc_channel_posix.h" |
159 #endif | 163 #endif |
160 | 164 |
161 #if defined(OS_WIN) | 165 #if defined(OS_WIN) |
162 #include <windows.h> | 166 #include <windows.h> |
163 #include <objbase.h> | 167 #include <objbase.h> |
164 #else | 168 #else |
165 // TODO(port) | 169 // TODO(port) |
166 #include "content/child/npapi/np_channel_base.h" | 170 #include "content/child/npapi/np_channel_base.h" |
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
585 Boolean key_exists = false; | 589 Boolean key_exists = false; |
586 Boolean value = CFPreferencesGetAppBooleanValue( | 590 Boolean value = CFPreferencesGetAppBooleanValue( |
587 key, kCFPreferencesCurrentApplication, &key_exists); | 591 key, kCFPreferencesCurrentApplication, &key_exists); |
588 if (key_exists && !value) | 592 if (key_exists && !value) |
589 is_elastic_overscroll_enabled_ = false; | 593 is_elastic_overscroll_enabled_ = false; |
590 } | 594 } |
591 #else | 595 #else |
592 is_elastic_overscroll_enabled_ = false; | 596 is_elastic_overscroll_enabled_ = false; |
593 #endif | 597 #endif |
594 | 598 |
| 599 #if defined(USE_OZONE) |
| 600 ui::OzoneClient::InitializeForRenderer(); |
| 601 #endif |
| 602 |
595 std::string image_texture_target_string = | 603 std::string image_texture_target_string = |
596 command_line.GetSwitchValueASCII(switches::kUseImageTextureTarget); | 604 command_line.GetSwitchValueASCII(switches::kUseImageTextureTarget); |
597 bool parsed_image_texture_target = base::StringToUint( | 605 bool parsed_image_texture_target = base::StringToUint( |
598 image_texture_target_string, &use_image_texture_target_); | 606 image_texture_target_string, &use_image_texture_target_); |
599 DCHECK(parsed_image_texture_target); | 607 DCHECK(parsed_image_texture_target); |
600 | 608 |
601 if (command_line.HasSwitch(switches::kDisableLCDText)) { | 609 if (command_line.HasSwitch(switches::kDisableLCDText)) { |
602 is_lcd_text_enabled_ = false; | 610 is_lcd_text_enabled_ = false; |
603 } else if (command_line.HasSwitch(switches::kEnableLCDText)) { | 611 } else if (command_line.HasSwitch(switches::kEnableLCDText)) { |
604 is_lcd_text_enabled_ = true; | 612 is_lcd_text_enabled_ = true; |
(...skipping 1280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1885 } | 1893 } |
1886 | 1894 |
1887 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 1895 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
1888 size_t erased = | 1896 size_t erased = |
1889 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 1897 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
1890 routing_id_); | 1898 routing_id_); |
1891 DCHECK_EQ(1u, erased); | 1899 DCHECK_EQ(1u, erased); |
1892 } | 1900 } |
1893 | 1901 |
1894 } // namespace content | 1902 } // namespace content |
OLD | NEW |