9187a6460f
Submitted by: clutton <clutton@zoho.com> Reviewed by: cpm, rene Obtained from: https://github.com/paranormal/ MFH: 2016Q4 Security: https://vuxml.freebsd.org/freebsd/769ba449-79e1-11e6-bf75-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/653a8059-7c49-11e6-9242-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/9c135c7e-9fa4-11e6-a265-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/9118961b-9fa5-11e6-a265-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/ae9cb9b8-a203-11e6-a265-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/a3473f5a-a739-11e6-afaa-e8e0b747a45a.html Differential Revision: https://reviews.freebsd.org/D8517
45 lines
1.8 KiB
C++
45 lines
1.8 KiB
C++
--- content/gpu/gpu_main.cc.orig 2016-07-20 22:03:24.000000000 +0300
|
|
+++ content/gpu/gpu_main.cc 2016-08-10 15:59:24.697490000 +0300
|
|
@@ -102,7 +102,7 @@
|
|
const base::CommandLine& command_line);
|
|
bool WarmUpSandbox(const base::CommandLine& command_line);
|
|
|
|
-#if !defined(OS_MACOSX)
|
|
+#if !defined(OS_MACOSX) && !defined(OS_BSD)
|
|
bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info);
|
|
#endif
|
|
|
|
@@ -192,13 +192,13 @@
|
|
// Use a UI message loop because ANGLE and the desktop GL platform can
|
|
// create child windows to render to.
|
|
base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
|
|
-#elif defined(OS_LINUX) && defined(USE_X11)
|
|
+#elif (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_X11)
|
|
// We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX
|
|
// and https://crbug.com/326995.
|
|
base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
|
|
std::unique_ptr<ui::PlatformEventSource> event_source =
|
|
ui::PlatformEventSource::CreateDefault();
|
|
-#elif defined(OS_LINUX)
|
|
+#elif defined(OS_LINUX) || defined(OS_BSD)
|
|
base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT);
|
|
#elif defined(OS_MACOSX)
|
|
// This is necessary for CoreAnimation layers hosted in the GPU process to be
|
|
@@ -309,7 +309,7 @@
|
|
// and we already registered them through SetGpuInfo() above.
|
|
base::TimeTicks before_collect_context_graphics_info =
|
|
base::TimeTicks::Now();
|
|
-#if !defined(OS_MACOSX)
|
|
+#if !defined(OS_MACOSX) && !defined(OS_BSD)
|
|
if (!CollectGraphicsInfo(gpu_info))
|
|
dead_on_arrival = true;
|
|
|
|
@@ -491,7 +491,7 @@
|
|
return true;
|
|
}
|
|
|
|
-#if !defined(OS_MACOSX)
|
|
+#if !defined(OS_MACOSX) && !defined(OS_BSD)
|
|
bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
|
|
TRACE_EVENT0("gpu,startup", "Collect Graphics Info");
|
|
|