diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-10-31 18:24:23 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-10-31 18:24:23 +0530 |
| commit | 37c03c78165fbb77eb024f2c3376d5e33cd7e446 (patch) | |
| tree | 282199e1d9c244c20d62f35b7f6517913d2e37f0 /components/script/dom/htmlcanvaselement.rs | |
| parent | 521a87180a85709f8f704df33537f79bd131bf71 (diff) | |
| parent | d8ef3809a6c73922a5affc475f623a0f1152be28 (diff) | |
| download | servo-37c03c78165fbb77eb024f2c3376d5e33cd7e446.tar.gz servo-37c03c78165fbb77eb024f2c3376d5e33cd7e446.zip | |
Auto merge of #8262 - nxnfufunezn:Remove_JS_root, r=Ms2ger
Removed JS::root #8251
Fixes #8251
r? @Ms2ger
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8262)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/htmlcanvaselement.rs')
| -rw-r--r-- | components/script/dom/htmlcanvaselement.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index 47126ed3dd0..67894f36429 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -153,7 +153,7 @@ impl HTMLCanvasElement { } match *self.context.borrow().as_ref().unwrap() { - CanvasContext::Context2d(ref context) => Some(context.root()), + CanvasContext::Context2d(ref context) => Some(Root::from_ref(&*context)), _ => None, } } @@ -182,7 +182,7 @@ impl HTMLCanvasElement { } if let Some(CanvasContext::WebGL(ref context)) = *self.context.borrow() { - Some(context.root()) + Some(Root::from_ref(&*context)) } else { None } |