diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-01-18 08:43:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 08:43:19 -0800 |
| commit | ba59ee662752891f9f9b452c1f4b847fad9f64ac (patch) | |
| tree | 5245a793e2c23ff506de757a616139898c7c6b9e /components/script/dom/element.rs | |
| parent | 68fa988bf32fab97a2d6ad3231de81c3bcb1939d (diff) | |
| parent | 127da41a2a2eb393b8497e178a6c28bc6ee3129e (diff) | |
| download | servo-ba59ee662752891f9f9b452c1f4b847fad9f64ac.tar.gz servo-ba59ee662752891f9f9b452c1f4b847fad9f64ac.zip | |
Auto merge of #15053 - emilio:image-width, r=jdm
Return the intrinsic image dimension when the image is not rendered
See individual commits for details.
r? @jdm
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15053)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/element.rs')
| -rw-r--r-- | components/script/dom/element.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index eb77b40b74c..2ca775ed345 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -1604,7 +1604,7 @@ impl ElementMethods for Element { // https://drafts.csswg.org/cssom-view/#dom-element-getboundingclientrect fn GetBoundingClientRect(&self) -> Root<DOMRect> { let win = window_from_node(self); - let rect = self.upcast::<Node>().bounding_content_box(); + let rect = self.upcast::<Node>().bounding_content_box_or_zero(); DOMRect::new(win.upcast(), rect.origin.x.to_f64_px(), rect.origin.y.to_f64_px(), |