diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-05 03:40:36 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-05 03:40:36 +0530 |
| commit | 2a6707ce58df27d93e865bffb6b44d396b810c99 (patch) | |
| tree | 849afb2986272f67b1abfc8720b8f530dc1c2227 /components/layout/context.rs | |
| parent | 9e68285d35a2e7b72c9edfd9e5e37399e724c4e6 (diff) | |
| parent | cb5cd8d881c39f549381e078b44f341dea733e68 (diff) | |
| download | servo-2a6707ce58df27d93e865bffb6b44d396b810c99.tar.gz servo-2a6707ce58df27d93e865bffb6b44d396b810c99.zip | |
Auto merge of #9532 - nox:dedup-heapsize, r=Manishearth
Say farewell to in-tree HeapSizeOf
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9532)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/context.rs')
| -rw-r--r-- | components/layout/context.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/layout/context.rs b/components/layout/context.rs index 9657590be3f..134a6f03b2b 100644 --- a/components/layout/context.rs +++ b/components/layout/context.rs @@ -14,6 +14,7 @@ use fnv::FnvHasher; use gfx::font_cache_thread::FontCacheThread; use gfx::font_context::FontContext; use gfx_traits::LayerId; +use heapsize::HeapSizeOf; use ipc_channel::ipc::{self, IpcSender}; use net_traits::image::base::Image; use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheThread, ImageResponse, ImageState}; @@ -27,7 +28,6 @@ use std::sync::{Arc, Mutex}; use style::context::{LocalStyleContext, SharedStyleContext, StyleContext}; use style::matching::{ApplicableDeclarationsCache, StyleSharingCandidateCache}; use url::Url; -use util::mem::HeapSizeOf; use util::opts; struct LocalLayoutContext { |