diff options
Diffstat (limited to 'www/chromium/files/patch-content_gpu_gpu__main.cc')
-rw-r--r-- | www/chromium/files/patch-content_gpu_gpu__main.cc | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc new file mode 100644 index 000000000000..daff262b902d --- /dev/null +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -0,0 +1,45 @@ +--- content/gpu/gpu_main.cc.orig 2016-05-11 19:02:21 UTC ++++ content/gpu/gpu_main.cc +@@ -99,7 +99,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUI + const base::CommandLine& command_line); + bool WarmUpSandbox(const base::CommandLine& command_line); + +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) //XXX(rene) added !FreeBSD + bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info); + #endif + +@@ -187,13 +187,13 @@ int GpuMain(const MainFunctionParams& pa + // 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); + scoped_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 +@@ -304,7 +304,7 @@ int GpuMain(const MainFunctionParams& pa + // 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_FREEBSD) //XXX(rene) added !FreeBSD + if (!CollectGraphicsInfo(gpu_info)) + dead_on_arrival = true; + +@@ -467,7 +467,7 @@ bool WarmUpSandbox(const base::CommandLi + return true; + } + +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_FREEBSD)//XXX(rene) added !FreeBSD + bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) { + TRACE_EVENT0("gpu,startup", "Collect Graphics Info"); + |