Skip to content

Commit

Permalink
Changes for gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
maharsh312 committed May 9, 2019
1 parent 6c6fb67 commit 30cc087
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -3,6 +3,7 @@
!/.cargo/config.*
/.servobuild
/.wpt
/.vs
/android-toolchains
/target
/ports/android/bin
Expand Down
3 changes: 0 additions & 3 deletions .vs/ProjectSettings.json

This file was deleted.

7 changes: 0 additions & 7 deletions .vs/VSWorkspaceState.json

This file was deleted.

Binary file removed .vs/servo/v15/.suo
Binary file not shown.
Binary file removed .vs/slnx.sqlite
Binary file not shown.
23 changes: 16 additions & 7 deletions components/script/dom/canvasrenderingcontext2d.rs
Expand Up @@ -132,9 +132,7 @@ pub struct CanvasState {
}

impl CanvasState {
pub fn new(
global: &GlobalScope,
) -> CanvasState {
pub fn new(global: &GlobalScope) -> CanvasState {
let (sender, receiver) =
profiled_ipc::channel(global.time_profiler_chan().clone()).unwrap();
let (ipc_renderer, canvas_id) = receiver.recv().unwrap();
Expand Down Expand Up @@ -247,8 +245,13 @@ impl CanvasRenderingContext2D {
// https://html.spec.whatwg.org/multipage/#concept-canvas-set-bitmap-dimensions
pub fn set_bitmap_dimensions(&self, size: Size2D<u32>) {
self.reset_to_initial_state();
self.canvas_state.borrow().ipc_renderer
.send(CanvasMsg::Recreate(size, self.canvas_state.borrow().get_canvas_id()))
self.canvas_state
.borrow()
.ipc_renderer
.send(CanvasMsg::Recreate(
size,
self.canvas_state.borrow().get_canvas_id(),
))
.unwrap();
}

Expand Down Expand Up @@ -656,7 +659,11 @@ pub trait LayoutCanvasRenderingContext2DHelpers {
impl LayoutCanvasRenderingContext2DHelpers for LayoutDom<CanvasRenderingContext2D> {
#[allow(unsafe_code)]
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)]
Expand Down Expand Up @@ -1523,7 +1530,9 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
impl Drop for CanvasRenderingContext2D {
fn drop(&mut 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()))
{
warn!("Could not close canvas: {}", err)
Expand Down

0 comments on commit 30cc087

Please sign in to comment.