Aura on Android: content/browser

content/browser/browser_main_loop.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/browser_main_loop.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 578 matching lines @@
 #if !defined(OS_IOS)
   // Start tracing to a file if needed. Only do this after starting the main
   // message loop to avoid calling MessagePumpForUI::ScheduleWork() before
   // MessagePumpForUI::Start() as it will crash the browser.
   if (is_tracing_startup_for_duration_) {
     TRACE_EVENT0("startup", "BrowserMainLoop::InitStartupTracingForDuration");
     InitStartupTracingForDuration(parsed_command_line_);
   }
 #endif  // !defined(OS_IOS)
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)

[no sievers, 2015/10/22 20:55:40]

revert this

[mfomitchev, 2015/11/02 21:51:15]

Removed for SurfaceTextureManager, left for ScreenOrientationProvider.

   {
     TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:SurfaceTextureManager");
     if (parsed_command_line_.HasSwitch(switches::kSingleProcess)) {
       SurfaceTextureManager::SetInstance(
           InProcessSurfaceTextureManager::GetInstance());
     } else {
       SurfaceTextureManager::SetInstance(
           BrowserSurfaceTextureManager::GetInstance());
     }
   }
@@ skipping 150 matching lines @@
     startup_task_runner_->AddTask(create_threads);
 
     StartupTask browser_thread_started = base::Bind(
         &BrowserMainLoop::BrowserThreadsStarted, base::Unretained(this));
     startup_task_runner_->AddTask(browser_thread_started);
 
     StartupTask pre_main_message_loop_run = base::Bind(
         &BrowserMainLoop::PreMainMessageLoopRun, base::Unretained(this));
     startup_task_runner_->AddTask(pre_main_message_loop_run);
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID)// && !defined(USE_AURA)

[no sievers, 2015/10/22 20:55:40]

remove commented out code

[mfomitchev, 2015/11/02 21:51:15]

Done.

     if (BrowserMayStartAsynchronously()) {
       startup_task_runner_->StartRunningTasksAsync();
     }
 #endif
   }
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID)// && !defined(USE_AURA)
   if (!BrowserMayStartAsynchronously()) {

[no sievers, 2015/10/22 20:55:40]

remove commented out code

[mfomitchev, 2015/11/02 21:51:15]

Done.

     // A second request for asynchronous startup can be ignored, so
     // StartupRunningTasksAsync is only called first time through. If, however,
     // this is a request for synchronous startup then it must override any
     // previous call for async startup, so we call RunAllTasksNow()
     // unconditionally.
     startup_task_runner_->RunAllTasksNow();
   }
 #else
   startup_task_runner_->RunAllTasksNow();
 #endif
@@ skipping 367 matching lines @@
 #if !defined(OS_IOS)
   HistogramSynchronizer::GetInstance();
 
 #if defined(OS_ANDROID)
   // Up the priority of the UI thread.
   base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
 #endif
 
   bool always_uses_gpu = true;
   bool established_gpu_channel = false;
-#if defined(OS_ANDROID)
+  // TODO(mfomitchev): Need ImageTransportFactory::Initialize on Android Aura,
+  // but figure out what to do with BrowserGpuChannelHostFactory.

[no sievers, 2015/10/22 20:55:40]

remove these changes and TODO; it's ok to fall through the aura path

[mfomitchev, 2015/11/02 21:51:15]

What about set_context_factory below, don't we need to do it on Aura? 
And also ImageTransportFactory::Initialize()?

+#if defined(OS_ANDROID) && !defined(USE_AURA)
   // TODO(crbug.com/439322): This should be set to |true|.
   established_gpu_channel = false;
   BrowserGpuChannelHostFactory::Initialize(established_gpu_channel);
 #elif defined(USE_AURA) || defined(OS_MACOSX)
   established_gpu_channel = true;
   if (!GpuDataManagerImpl::GetInstance()->CanUseGpuBrowserCompositor() ||
       parsed_command_line_.HasSwitch(switches::kDisableGpuEarlyInit)) {
     established_gpu_channel = always_uses_gpu = false;
   }
   BrowserGpuChannelHostFactory::Initialize(established_gpu_channel);
@@ skipping 175 matching lines @@
   if (command_line.HasSwitch(switches::kTraceStartup)) {
     trace_file = command_line.GetSwitchValuePath(
         switches::kTraceStartupFile);
     // trace_file = "none" means that startup events will show up for the next
     // begin/end tracing (via about:tracing or AutomationProxy::BeginTracing/
     // EndTracing, for example).
     if (trace_file == base::FilePath().AppendASCII("none"))
       return trace_file;
 
     if (trace_file.empty()) {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
       TracingControllerAndroid::GenerateTracingFilePath(&trace_file);
 #else
       // Default to saving the startup trace into the current dir.
       trace_file = base::FilePath().AppendASCII("chrometrace.log");
 #endif
     }
   } else {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
     TracingControllerAndroid::GenerateTracingFilePath(&trace_file);
 #else
     trace_file = tracing::TraceConfigFile::GetInstance()->GetResultFile();
 #endif
   }
 
   return trace_file;
 }
 
 void BrowserMainLoop::InitStartupTracingForDuration(
@@ skipping 28 matching lines @@
   DCHECK(is_tracing_startup_for_duration_);
 
   is_tracing_startup_for_duration_ = false;
   TracingController::GetInstance()->DisableRecording(
       TracingController::CreateFileSink(
           startup_trace_file_,
           base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
 }
 
 }  // namespace content