mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Auto merge of #6591 - servo:rustup_2015-07-10, r=larsbergstrom
Upgrade to rustc 1.3.0-dev (fddfd089b 2015-07-10) Depends on https://github.com/jgraham/webdriver-rust/pull/12. Fixes #6020. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6591) <!-- Reviewable:end -->
This commit is contained in:
commit
9af229b830
25 changed files with 317 additions and 247 deletions
|
@ -1155,10 +1155,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
|
|||
}
|
||||
|
||||
fn fill_paint_request_with_cached_layer_buffers(&mut self, paint_request: &mut PaintRequest) {
|
||||
if opts::get().gpu_painting {
|
||||
return;
|
||||
}
|
||||
|
||||
for buffer_request in paint_request.buffer_requests.iter_mut() {
|
||||
if self.buffer_map.mem() == 0 {
|
||||
return;
|
||||
|
@ -1169,7 +1165,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
|
|||
buffer.screen_pos = buffer_request.screen_rect;
|
||||
buffer.resolution = paint_request.scale;
|
||||
buffer.native_surface.mark_wont_leak();
|
||||
buffer.painted_with_cpu = true;
|
||||
buffer.painted_with_cpu = !opts::get().gpu_painting;
|
||||
buffer.content_age = buffer_request.content_age;
|
||||
buffer_request.layer_buffer = Some(buffer);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue