diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-11-03 18:11:05 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-03 18:11:05 -0500 |
commit | ce725c9475b9fb97a8559b29c1e7a080633cd002 (patch) | |
tree | c95f5e2c07adfd29e4a9751430ed44aecf9ab53c /components/script/document_loader.rs | |
parent | 74a3ea9135b13683a9e223790fe573a46cc6a141 (diff) | |
parent | f3993d99b965cd0accb2eed77fb27dd1eb863848 (diff) | |
download | servo-ce725c9475b9fb97a8559b29c1e7a080633cd002.tar.gz servo-ce725c9475b9fb97a8559b29c1e7a080633cd002.zip |
Auto merge of #13646 - asajeffrey:script-lookup-iframes-by-frameid, r=ConnorGBrewster
Script lookup iframes by frameid
<!-- Please describe your changes on the following line: -->
Lookup iframes by `FrameId` rather than `PipelineId`. This should make lookup much more reliable, since the frame id doesn't change.
cc @ConnorGBrewster @aneeshusa
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because refactoring
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- 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/13646)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/document_loader.rs')
-rw-r--r-- | components/script/document_loader.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/components/script/document_loader.rs b/components/script/document_loader.rs index 837660109c3..04b9e258573 100644 --- a/components/script/document_loader.rs +++ b/components/script/document_loader.rs @@ -94,6 +94,7 @@ impl DocumentLoader { pub fn new_with_threads(resource_threads: ResourceThreads, initial_load: Option<Url>) -> DocumentLoader { + debug!("Initial blocking load {:?}.", initial_load); let initial_loads = initial_load.into_iter().map(LoadType::PageSource).collect(); DocumentLoader { @@ -105,6 +106,7 @@ impl DocumentLoader { /// Add a load to the list of blocking loads. fn add_blocking_load(&mut self, load: LoadType) { + debug!("Adding blocking load {:?} ({}).", load, self.blocking_loads.len()); self.blocking_loads.push(load); } @@ -119,6 +121,7 @@ impl DocumentLoader { /// Mark an in-progress network request complete. pub fn finish_load(&mut self, load: &LoadType) { + debug!("Removing blocking load {:?} ({}).", load, self.blocking_loads.len()); let idx = self.blocking_loads.iter().position(|unfinished| *unfinished == *load); self.blocking_loads.remove(idx.expect(&format!("unknown completed load {:?}", load))); } |