| 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 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 629 #endif | 629 #endif |
| 630 | 630 |
| 631 lazy_tls.Pointer()->Set(this); | 631 lazy_tls.Pointer()->Set(this); |
| 632 | 632 |
| 633 // Register this object as the main thread. | 633 // Register this object as the main thread. |
| 634 ChildProcess::current()->set_main_thread(this); | 634 ChildProcess::current()->set_main_thread(this); |
| 635 | 635 |
| 636 #if defined(USE_AURA) | 636 #if defined(USE_AURA) |
| 637 if (IsRunningInMash()) { | 637 if (IsRunningInMash()) { |
| 638 gpu_service_ = | 638 gpu_service_ = |
| 639 ui::GpuService::Initialize(GetMojoShellConnection()->GetConnector()); | 639 ui::GpuService::Create(GetMojoShellConnection()->GetConnector(), |
| 640 ChildProcess::current()->io_task_runner()); |
| 640 } | 641 } |
| 641 #endif | 642 #endif |
| 642 | 643 |
| 643 InitializeWebKit(resource_task_queue); | 644 InitializeWebKit(resource_task_queue); |
| 644 | 645 |
| 645 // In single process the single process is all there is. | 646 // In single process the single process is all there is. |
| 646 webkit_shared_timer_suspended_ = false; | 647 webkit_shared_timer_suspended_ = false; |
| 647 widget_count_ = 0; | 648 widget_count_ = 0; |
| 648 hidden_widget_count_ = 0; | 649 hidden_widget_count_ = 0; |
| 649 idle_notification_delay_in_ms_ = kInitialIdleHandlerDelayMs; | 650 idle_notification_delay_in_ms_ = kInitialIdleHandlerDelayMs; |
| (...skipping 1581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2231 v8_memory_pressure_level == v8::MemoryPressureLevel::kCritical) | 2232 v8_memory_pressure_level == v8::MemoryPressureLevel::kCritical) |
| 2232 v8_memory_pressure_level = v8::MemoryPressureLevel::kModerate; | 2233 v8_memory_pressure_level = v8::MemoryPressureLevel::kModerate; |
| 2233 | 2234 |
| 2234 blink::mainThreadIsolate()->MemoryPressureNotification( | 2235 blink::mainThreadIsolate()->MemoryPressureNotification( |
| 2235 v8_memory_pressure_level); | 2236 v8_memory_pressure_level); |
| 2236 blink::MemoryPressureNotificationToWorkerThreadIsolates( | 2237 blink::MemoryPressureNotificationToWorkerThreadIsolates( |
| 2237 v8_memory_pressure_level); | 2238 v8_memory_pressure_level); |
| 2238 } | 2239 } |
| 2239 | 2240 |
| 2240 } // namespace content | 2241 } // namespace content |
| OLD | NEW |