diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-05-06 12:46:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-06 12:46:09 -0400 |
| commit | 64c848950c50b1946e5a3f69d66ca5aac5b9ce1a (patch) | |
| tree | 3c99bcb82c40ae9f07443b143e8a28ab4c0197cd /components/script/dom/history.rs | |
| parent | af077f8cf7feeb3ae791be133e4b3a10bf9ef614 (diff) | |
| parent | 57d2b5a92df4348ba6131691fc41b05148bf5904 (diff) | |
| download | servo-64c848950c50b1946e5a3f69d66ca5aac5b9ce1a.tar.gz servo-64c848950c50b1946e5a3f69d66ca5aac5b9ce1a.zip | |
Auto merge of #23299 - jdm:minimize-mozjs-deps, r=Manishearth
Remove mozjs dep from malloc_size_of.
This makes making local changes to mozjs_sys much more frustrating than it should be, and blocks merging #22130.
---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
<!-- 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/23299)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/history.rs')
| -rw-r--r-- | components/script/dom/history.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/components/script/dom/history.rs b/components/script/dom/history.rs index e468b79440c..787591af8a3 100644 --- a/components/script/dom/history.rs +++ b/components/script/dom/history.rs @@ -40,6 +40,7 @@ enum PushOrReplace { pub struct History { reflector_: Reflector, window: Dom<Window>, + #[ignore_malloc_size_of = "mozjs"] state: Heap<JSVal>, state_id: Cell<Option<HistoryStateId>>, } |