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/layout_thread.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/layout_thread.rs')
| -rw-r--r-- | components/layout/layout_thread.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/layout/layout_thread.rs b/components/layout/layout_thread.rs index 206bfe4c82d..2b1950d88ce 100644 --- a/components/layout/layout_thread.rs +++ b/components/layout/layout_thread.rs @@ -28,6 +28,7 @@ use gfx::font_cache_thread::FontCacheThread; use gfx::font_context; use gfx::paint_thread::{LayoutToPaintMsg, PaintLayer}; use gfx_traits::{color, Epoch, LayerId, ScrollPolicy}; +use heapsize::HeapSizeOf; use incremental::{LayoutDamageComputation, REFLOW, REFLOW_ENTIRE_DOCUMENT, REPAINT}; use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; use ipc_channel::router::ROUTER; @@ -73,7 +74,6 @@ use url::Url; use util::geometry::MAX_RECT; use util::ipc::OptionalIpcSender; use util::logical_geometry::LogicalPoint; -use util::mem::HeapSizeOf; use util::opts; use util::thread; use util::thread_state; |