From 30cc087526c1d06424c770db1d851ed90a28c926 Mon Sep 17 00:00:00 2001 From: Maharsh Date: Thu, 9 May 2019 18:30:25 -0400 Subject: [PATCH] Changes for gitignore --- .gitignore | 1 + .vs/ProjectSettings.json | 3 --- .vs/VSWorkspaceState.json | 7 ------ .vs/servo/v15/.suo | Bin 15360 -> 0 bytes .vs/slnx.sqlite | Bin 77824 -> 0 bytes .../script/dom/canvasrenderingcontext2d.rs | 23 ++++++++++++------ 6 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 .vs/ProjectSettings.json delete mode 100644 .vs/VSWorkspaceState.json delete mode 100644 .vs/servo/v15/.suo delete mode 100644 .vs/slnx.sqlite diff --git a/.gitignore b/.gitignore index bf0df10791c..50b1a37ec15 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ !/.cargo/config.* /.servobuild /.wpt +/.vs /android-toolchains /target /ports/android/bin diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json deleted file mode 100644 index 2b7b33d8ded..00000000000 --- a/.vs/ProjectSettings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "CurrentProjectSetting": "x64-Debug (default)" -} \ No newline at end of file diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json deleted file mode 100644 index 69b2c31a3c7..00000000000 --- a/.vs/VSWorkspaceState.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "ExpandedNodes": [ - "" - ], - "SelectedNode": "\\components", - "PreviewInSolutionExplorer": false -} \ No newline at end of file diff --git a/.vs/servo/v15/.suo b/.vs/servo/v15/.suo deleted file mode 100644 index 72ace035989e52998cd668fc23f56daa74467f72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15360 zcmeHO&2t>Z74NkpV-p)N1d|YhH?~7aEN@m4@&}PjWJ$(~rC8CfWdb5%G}|l2nw?S2 z%nI#|6I>~79Jx}tr1BTQk)kjMDn(Ho;Fe=5hny0e->+xeJ3HRlon1KyZT4-w`RMMM z*YBfWzwUYa+3llWzyFsfzY#IGB=(DM?;H{bBIOxe@6-2>2=N14v+UbDckZxwKMsD2kK*#V_(-F!*w^~pYPE?UlSewx_ofneF^B8jkRiQ^3o> zY2XZS7I+2tBJe734){CZHQ+pO0r-31b>Jc}%5yPte=~9&ZIg7pTb6Jc5sxc25RVv$ zH8vvA2N*~J#}R+fhG-k)A;lwN1&yd%LJ@R*(49xD<0BF(h}TsN76?;CMt;~V@yPgx zwo5xrOaB$LrEL?Iq4`D7Ul*&e1rt56#1^7H#)APYLLw^kQ8xmsqrJr;5BgEv#p_$$ z(*|^Tls;o%%D}*x{b2lQK^hKv=AnnJ`f&mD8N+dWrR6_Le?csX8yJZN(6N=oLyB39 z0t+P)RNKKbJ;dLC!V76HgaTx4LIYd{Y=L446g|i~-k%&S#Dzpk(3gvTQbL4FJQmNg#Pc&(Y@$Dv~$Yb!Tarq*7eFrs!>6yQ|3|~8#eJg?C%8np~pa@XUSJl`?;rNf+c_`;HI9`X9)6z8eF~arRVd$UhF1_Yz-Kx3tkGR#o?0)E9>prdg2l{XL z|J~Mq2DY#dIEerLKjXh<&(QrH_kR}Pschw^3OF*33{bLJpVe=n#U$*D7RD&N8R&-} zQ$?^u8e^C6(rtRa-r+Rn^X3TH7gBwr}8TN2?vASkk<~3O>x*O7&T+5G@$IIu-BO|5pyfJ1Rrb%pe zB$bJT}d=uCCmbpp?|ZRzEfs!l-$f#t0GGe%%=ZG3FQvTce3b&m9= z%IG34PfyJGS1eoBn@^d6wIwfYtgc=*%ndw$#gcaEl0RSbAhXH#)k3T^v8kk}r0acf^t* zXK`JA6Q1*z`2(@K~=RH<-P=C39f@(v>#Qo@_Afwom9b(I{{oF)=44!*xoFCD?|U=B0-IUGl^JDA6D3@y0YG|`$gB<_XyxDU86v6m7kZa(b;ZYt0v zb>#Jpetg&~?Xy3uEx=A#sGGg$0qB1?R(zbzJ*$&A7u)c3&-D#ATvJvQH=pf6e-_t` ziTR1MPH1;Re9{LzS(r^ZtJ9}_-Us}I895u!)F!;c-u2bm%CvXmmj%0Tw6uj$#L?t| zCrhj;zW&w+)-}F+i|$3-z&+o6l^fB~-`Tr&?XRNG@Hzo1*aDQ^pa0(L{_#6QqhEZr+<1Pl z|DPb}gyOjT5}N(bisN5D!Y??T^PY8w2KhgO{2zWk(xC04-FcAz)5!m6C#SS^TJ}7r zeMYw{BFpG3=EoU)2R*M=a2K#|kVk1AC9}w%%wttIg8ES$r*OWA^Elct!&2p6Wpqww zTKfFntM{jih;6whiRS&}uzzf0=B}xzp0zpy=Nei!|3Bqi5BX304@0#+akr+wq+)Nq z$IN`Z5_)+rb>^JzEdQz<{Q|fR@MAQ_>_4567wyLc=rfm%xwdKLkEY^Leog^g$ExWT z_Q|ui@*%iD1BxZO7vj^ajL5{&)tV) zcoy>K|8MwBEG_>9w51Ow#OX61%tQ~k>yeyw7e31)@;|%Ie`UO`^DkS`XY|1lCxM;% zgYln<{!gLNv*fEkw4u*2M%v8FV*VXv(GHmZs&iP<%Afy%`UeLLAkKe-ehn*_HT1#` z8zvmJ{EwqPE&X=(zW{zKpvwONMtyRU4I=-rYyC4{xmf2X&VOtBkM^Wl5b(bl=F;-} zV_N>1WRqlnAtlZ^;XeVVFcLQ5AL$u&mTt5MoPYSAH|B(-rO)0pp%oxS=QF hEJ#~))Ht{TjTq2O+$+)kX-}k0z-33E@8MdL@LzWMcenrm diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite deleted file mode 100644 index c5a5191e8731c0e33a810b05d74808ede93e203d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77824 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 diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index 96da2168916..285925b7302 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/components/script/dom/canvasrenderingcontext2d.rs @@ -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(); @@ -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) { 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(); } @@ -656,7 +659,11 @@ pub trait LayoutCanvasRenderingContext2DHelpers { impl LayoutCanvasRenderingContext2DHelpers for LayoutDom { #[allow(unsafe_code)] unsafe fn get_ipc_renderer(&self) -> IpcSender { - (*self.unsafe_get()).canvas_state.borrow().ipc_renderer.clone() + (*self.unsafe_get()) + .canvas_state + .borrow() + .ipc_renderer + .clone() } #[allow(unsafe_code)] @@ -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)