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

Rename RenderState -> PaintState

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2014-12-08 13:28:13 +09:00
parent b5f73fb179
commit 806b6f09c9
8 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ports/android/glut_app/window.rs
View file

@ -19,7 +19,7 @@ use geom::scale_factor::ScaleFactor;
use geom::size::TypedSize2D;
use layers::geometry::DevicePixel;
use layers::platform::surface::NativeGraphicsMetadata;
use msg::compositor_msg::{IdleRenderState, RenderState};
use msg::compositor_msg::{IdlePaintState, PaintState};
use msg::compositor_msg::{Blank, ReadyState};
use util::geometry::ScreenPx;
@ -41,7 +41,7 @@ pub struct Window {
pub mouse_down_point: Cell<Point2D<c_int>>,
pub ready_state: Cell<ReadyState>,
pub render_state: Cell<RenderState>,
pub render_state: Cell<PaintState>,
pub throbber_frame: Cell<u8>,
}
@ -65,7 +65,7 @@ impl Window {
mouse_down_point: Cell::new(Point2D(0 as c_int, 0)),
ready_state: Cell::new(Blank),
render_state: Cell::new(IdleRenderState),
render_state: Cell::new(IdlePaintState),
throbber_frame: Cell::new(0),
};
@ -180,9 +180,9 @@ impl WindowMethods for Window {
//self.update_window_title()
}
/// Sets the render state.
fn set_render_state(&self, render_state: RenderState) {
self.render_state.set(render_state);
/// Sets the paint state.
fn set_render_state(&self, paint_state: PaintState) {
self.render_state.set(paint_state);
//FIXME: set_window_title causes crash with Android version of freeGLUT. Temporarily blocked.
//self.update_window_title()
}
@ -216,10 +216,10 @@ impl Window {
// }
// FinishedLoading => {
// match self.render_state {
// RenderingRenderState => {
// PaintingPaintState => {
// glut::set_window_title(self.glut_window, format!("{:c} Rendering . Servo", throbber))
// }
// IdleRenderState => glut::set_window_title(self.glut_window, "Servo"),
// IdlePaintState => glut::set_window_title(self.glut_window, "Servo"),
// }
// }
// }

16
ports/glfw/window.rs
View file

@ -24,7 +24,7 @@ use layers::geometry::DevicePixel;
use layers::platform::surface::NativeGraphicsMetadata;
use libc::c_int;
use msg::compositor_msg::{FinishedLoading, Blank, Loading, PerformingLayout, ReadyState};
use msg::compositor_msg::{IdleRenderState, RenderState, RenderingRenderState};
use msg::compositor_msg::{IdlePaintState, PaintState, PaintingPaintState};
use msg::constellation_msg;
use std::cell::{Cell, RefCell};
use std::comm::Receiver;
@ -45,7 +45,7 @@ pub struct Window {
mouse_down_point: Cell<Point2D<c_int>>,
ready_state: Cell<ReadyState>,
render_state: Cell<RenderState>,
render_state: Cell<PaintState>,
last_title_set_time: Cell<Timespec>,
}
@ -78,7 +78,7 @@ impl Window {
mouse_down_point: Cell::new(Point2D(0 as c_int, 0)),
ready_state: Cell::new(Blank),
render_state: Cell::new(IdleRenderState),
render_state: Cell::new(IdlePaintState),
last_title_set_time: Cell::new(Timespec::new(0, 0)),
};
@ -159,9 +159,9 @@ impl WindowMethods for Window {
self.update_window_title()
}
/// Sets the render state.
fn set_render_state(&self, render_state: RenderState) {
self.render_state.set(render_state);
/// Sets the paint state.
fn set_render_state(&self, paint_state: PaintState) {
self.render_state.set(paint_state);
self.update_window_title()
}
@ -303,10 +303,10 @@ impl Window {
}
FinishedLoading => {
match self.render_state.get() {
RenderingRenderState => {
PaintingPaintState => {
self.glfw_window.set_title("Rendering — Servo [GLFW]")
}
IdleRenderState => {
IdlePaintState => {
self.glfw_window.set_title("Servo [GLFW]")
}
}

16
ports/glutin/window.rs
View file

@ -18,7 +18,7 @@ use geom::size::TypedSize2D;
use gleam::gl;
use layers::geometry::DevicePixel;
use layers::platform::surface::NativeGraphicsMetadata;
use msg::compositor_msg::{IdleRenderState, RenderState, RenderingRenderState};
use msg::compositor_msg::{IdlePaintState, PaintState, PaintingPaintState};
use msg::compositor_msg::{FinishedLoading, Blank, Loading, PerformingLayout, ReadyState};
use std::cell::{Cell, RefCell};
use std::rc::Rc;
@ -66,7 +66,7 @@ pub struct Window {
mouse_pos: Cell<Point2D<int>>,
ready_state: Cell<ReadyState>,
render_state: Cell<RenderState>,
render_state: Cell<PaintState>,
key_modifiers: Cell<KeyModifiers>,
last_title_set_time: Cell<Timespec>,
@ -118,7 +118,7 @@ impl Window {
mouse_pos: Cell::new(Point2D(0, 0)),
ready_state: Cell::new(Blank),
render_state: Cell::new(IdleRenderState),
render_state: Cell::new(IdlePaintState),
key_modifiers: Cell::new(KeyModifiers::empty()),
last_title_set_time: Cell::new(Timespec::new(0, 0)),
@ -173,9 +173,9 @@ impl WindowMethods for Window {
self.update_window_title()
}
/// Sets the render state.
fn set_render_state(&self, render_state: RenderState) {
self.render_state.set(render_state);
/// Sets the paint state.
fn set_render_state(&self, paint_state: PaintState) {
self.render_state.set(paint_state);
self.update_window_title()
}
@ -234,10 +234,10 @@ impl Window {
}
FinishedLoading => {
match self.render_state.get() {
RenderingRenderState => {
PaintingPaintState => {
window.set_title("Rendering - Servo [glutin]")
}
IdleRenderState => {
IdlePaintState => {
window.set_title("Servo [glutin]")
}
}