Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #3752 : pcwalton/servo/default-cpu, r=larsbergstrom

Browse source 
We've discussed this some and I think there's consensus to do it as a
pragmatic decision for now. CPU painting is more stable, especially with
buggy drivers, and faster (because we aren't caching the necessary
OpenGL objects yet and possibly for other reasons), so it provides a
better "out of the box" experience for newcomers to Servo who don't know
to pass the `-c` option. This patch continues to reftest both Skia and
Skia-GL out of a desire to keep options open. Skia-GL remains a
first-class citizen.

r? @metajack
This commit is contained in:
bors-servo 2014-10-21 21:18:33 -06:00
commit 1fd7650de5
4 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/gfx/render_task.rs
View file

@ -162,7 +162,7 @@ impl<C:RenderListener + Send> RenderTask<C> {
{ // Ensures RenderTask and graphics context are destroyed before shutdown msg
let native_graphics_context = compositor.get_graphics_metadata().map(
|md| NativePaintingGraphicsContext::from_metadata(&md));
let cpu_painting = opts::get().cpu_painting;
let gpu_painting = opts::get().gpu_painting;
// FIXME: rust/#5967
let mut render_task = RenderTask {
@ -173,10 +173,10 @@ impl<C:RenderListener + Send> RenderTask<C> {
font_ctx: box FontContext::new(fc.clone()),
time_profiler_chan: time_profiler_chan,
graphics_context: if cpu_painting {
CpuGraphicsContext
} else {
graphics_context: if gpu_painting {
GpuGraphicsContext
} else {
CpuGraphicsContext
},
native_graphics_context: native_graphics_context,