Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changes for gitignore

Browse source
This commit is contained in:
Maharsh 2019-05-09 18:30:25 -04:00
parent 6c6fb676b7
commit 30cc087526
6 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -3,6 +3,7 @@
!/.cargo/config.* !/.cargo/config.*
/.servobuild /.servobuild
/.wpt /.wpt
/.vs
/android-toolchains /android-toolchains
/target /target
/ports/android/bin /ports/android/bin

3
.vs/ProjectSettings.json
View file

@ -1,3 +0,0 @@
{
"CurrentProjectSetting": "x64-Debug (default)"
}

7
.vs/VSWorkspaceState.json
View file

@ -1,7 +0,0 @@
{
"ExpandedNodes": [
""
],
"SelectedNode": "\\components",
"PreviewInSolutionExplorer": false
}

BIN
.vs/servo/v15/.suo
View file

Binary file not shown.

BIN
.vs/slnx.sqlite
View file

Binary file not shown.

23
components/script/dom/canvasrenderingcontext2d.rs
View file

@ -132,9 +132,7 @@ pub struct CanvasState {
} }
impl CanvasState { impl CanvasState {
pub fn new( pub fn new(global: &GlobalScope) -> CanvasState {
global: &GlobalScope,
) -> CanvasState {
let (sender, receiver) = let (sender, receiver) =
profiled_ipc::channel(global.time_profiler_chan().clone()).unwrap(); profiled_ipc::channel(global.time_profiler_chan().clone()).unwrap();
let (ipc_renderer, canvas_id) = receiver.recv().unwrap(); let (ipc_renderer, canvas_id) = receiver.recv().unwrap();
@ -247,8 +245,13 @@ impl CanvasRenderingContext2D {
// https://html.spec.whatwg.org/multipage/#concept-canvas-set-bitmap-dimensions // https://html.spec.whatwg.org/multipage/#concept-canvas-set-bitmap-dimensions
pub fn set_bitmap_dimensions(&self, size: Size2D<u32>) { pub fn set_bitmap_dimensions(&self, size: Size2D<u32>) {
self.reset_to_initial_state(); self.reset_to_initial_state();
self.canvas_state.borrow().ipc_renderer self.canvas_state
.send(CanvasMsg::Recreate(size, self.canvas_state.borrow().get_canvas_id())) .borrow()
.ipc_renderer
.send(CanvasMsg::Recreate(
size,
self.canvas_state.borrow().get_canvas_id(),
))
.unwrap(); .unwrap();
} }
@ -656,7 +659,11 @@ pub trait LayoutCanvasRenderingContext2DHelpers {
impl LayoutCanvasRenderingContext2DHelpers for LayoutDom<CanvasRenderingContext2D> { impl LayoutCanvasRenderingContext2DHelpers for LayoutDom<CanvasRenderingContext2D> {
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn get_ipc_renderer(&self) -> IpcSender<CanvasMsg> { unsafe fn get_ipc_renderer(&self) -> IpcSender<CanvasMsg> {
(*self.unsafe_get()).canvas_state.borrow().ipc_renderer.clone() (*self.unsafe_get())
.canvas_state
.borrow()
.ipc_renderer
.clone()
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]
@ -1523,7 +1530,9 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
impl Drop for CanvasRenderingContext2D { impl Drop for CanvasRenderingContext2D {
fn drop(&mut self) { fn drop(&mut self) {
if let Err(err) = self if let Err(err) = self
.canvas_state.borrow().ipc_renderer .canvas_state
.borrow()
.ipc_renderer
.send(CanvasMsg::Close(self.canvas_state.borrow().get_canvas_id())) .send(CanvasMsg::Close(self.canvas_state.borrow().get_canvas_id()))
{ {
warn!("Could not close canvas: {}", err) warn!("Could not close canvas: {}", err)