Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 777303004: Android: Don't spin up GPU process early (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/browser/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 established_gpu_channel = always_uses_gpu = false; 1025 established_gpu_channel = always_uses_gpu = false;
1026 } 1026 }
1027 BrowserGpuChannelHostFactory::Initialize(established_gpu_channel); 1027 BrowserGpuChannelHostFactory::Initialize(established_gpu_channel);
1028 ImageTransportFactory::Initialize(); 1028 ImageTransportFactory::Initialize();
1029 #if defined(USE_AURA) 1029 #if defined(USE_AURA)
1030 if (aura::Env::GetInstance()) { 1030 if (aura::Env::GetInstance()) {
1031 aura::Env::GetInstance()->set_context_factory(GetContextFactory()); 1031 aura::Env::GetInstance()->set_context_factory(GetContextFactory());
1032 } 1032 }
1033 #endif 1033 #endif
1034 #elif defined(OS_ANDROID) 1034 #elif defined(OS_ANDROID)
1035 established_gpu_channel = true; 1035 // TODO(crbug.com/439322): This should be set to |true|.
1036 established_gpu_channel = false;
1036 BrowserGpuChannelHostFactory::Initialize(established_gpu_channel); 1037 BrowserGpuChannelHostFactory::Initialize(established_gpu_channel);
1037 #endif 1038 #endif
1038 1039
1039 #if defined(OS_LINUX) && defined(USE_UDEV) 1040 #if defined(OS_LINUX) && defined(USE_UDEV)
1040 device_monitor_linux_.reset(new DeviceMonitorLinux()); 1041 device_monitor_linux_.reset(new DeviceMonitorLinux());
1041 #elif defined(OS_MACOSX) 1042 #elif defined(OS_MACOSX)
1042 device_monitor_mac_.reset(new DeviceMonitorMac()); 1043 device_monitor_mac_.reset(new DeviceMonitorMac());
1043 #endif 1044 #endif
1044 1045
1045 // RDH needs the IO thread to be created 1046 // RDH needs the IO thread to be created
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
1217 1218
1218 void BrowserMainLoop::EndStartupTracing() { 1219 void BrowserMainLoop::EndStartupTracing() {
1219 is_tracing_startup_ = false; 1220 is_tracing_startup_ = false;
1220 TracingController::GetInstance()->DisableRecording( 1221 TracingController::GetInstance()->DisableRecording(
1221 TracingController::CreateFileSink( 1222 TracingController::CreateFileSink(
1222 startup_trace_file_, 1223 startup_trace_file_,
1223 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1224 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1224 } 1225 }
1225 1226
1226 } // namespace content 1227 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698