a099dbbc1d
There were two updates submitted as Github pull requests: - one for 41.0.2272.118 - one for 42.0.2311.90, based on the first update. Submitted by: Timothy Vaccarelli <tmvfroid@gmail.com> (41.0.2272.118) Submitted by: Christoph Moench-Tegeder <cmt@burggraben.net> (42.0.2311.90) MFH: 2015Q2 Security: http://vuxml.freebsd.org/freebsd/b57f690e-ecc9-11e4-876c-00262d5ed8ee.html
45 lines
1.8 KiB
C++
45 lines
1.8 KiB
C++
--- content/gpu/gpu_main.cc.orig 2015-04-19 00:48:39.000000000 +0200
|
|
+++ content/gpu/gpu_main.cc 2015-04-19 00:51:41.000000000 +0200
|
|
@@ -73,7 +73,7 @@
|
|
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
|
|
|
|
@@ -162,13 +162,13 @@
|
|
message_loop_type = base::MessageLoop::TYPE_UI;
|
|
}
|
|
base::MessageLoop main_message_loop(message_loop_type);
|
|
-#elif defined(OS_LINUX) && defined(USE_X11)
|
|
+#elif (defined(OS_BSD) || defined(OS_LINUX)) && 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
|
|
@@ -269,7 +269,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_FREEBSD) //XXX(rene) added !FreeBSD
|
|
if (!CollectGraphicsInfo(gpu_info))
|
|
dead_on_arrival = true;
|
|
|
|
@@ -402,7 +402,7 @@
|
|
return true;
|
|
}
|
|
|
|
-#if !defined(OS_MACOSX)
|
|
+#if !defined(OS_MACOSX) && !defined(OS_FREEBSD)//XXX(rene) added !FreeBSD
|
|
bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
|
|
bool res = true;
|
|
gpu::CollectInfoResult result = gpu::CollectContextGraphicsInfo(&gpu_info);
|