diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-01-27 01:31:47 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-27 01:31:47 -0800 |
commit | 5af74c38fce01c8e893744514a5cfbcd913de71c (patch) | |
tree | f60362cd3f9123726edabb21578db9cd38ec96a0 /components/script/script_thread.rs | |
parent | 17953740071b97074b836523b3a3e8f733f58423 (diff) | |
parent | b9e7aae9a29fb8e5ab2cd7c642c13013093e0c5c (diff) | |
download | servo-5af74c38fce01c8e893744514a5cfbcd913de71c.tar.gz servo-5af74c38fce01c8e893744514a5cfbcd913de71c.zip |
Auto merge of #15238 - servo:clip_rect, r=emilio
Remove unused InProgressLoad::clip_rect.
<!-- 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/15238)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_thread.rs')
-rw-r--r-- | components/script/script_thread.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index b4a922a6e2e..7cb6a590ac0 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -147,8 +147,6 @@ struct InProgressLoad { window_size: Option<WindowSizeData>, /// Channel to the layout thread associated with this pipeline. layout_chan: Sender<message::Msg>, - /// The current viewport clipping rectangle applying to this pipeline, if any. - clip_rect: Option<Rect<f32>>, /// Window is frozen (navigated away while loading for example). is_frozen: bool, /// Window is visible. @@ -173,7 +171,6 @@ impl InProgressLoad { parent_info: parent_info, layout_chan: layout_chan, window_size: window_size, - clip_rect: None, is_frozen: false, is_visible: true, url: url, @@ -1166,9 +1163,8 @@ impl ScriptThread { } return; } - let mut loads = self.incomplete_loads.borrow_mut(); - if let Some(ref mut load) = loads.iter_mut().find(|load| load.pipeline_id == id) { - load.clip_rect = Some(rect); + let loads = self.incomplete_loads.borrow(); + if loads.iter().any(|load| load.pipeline_id == id) { return; } warn!("Page rect message sent to nonexistent pipeline"); |