diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-25 22:42:31 -0500 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-25 22:42:31 -0500 |
commit | edf121324e475270f56f539900ff24f9005f3fdb (patch) | |
tree | 56fe4701bd387935fb426dc34f52a7c4d877b3ce /components/script/dom/browsingcontext.rs | |
parent | 345b8b9c00b146259b2b665775c3a5aa7ded6056 (diff) | |
parent | e7eee3b0675eadf61e504f44aa1ae6fc474b7ee3 (diff) | |
download | servo-edf121324e475270f56f539900ff24f9005f3fdb.tar.gz servo-edf121324e475270f56f539900ff24f9005f3fdb.zip |
Auto merge of #11370 - Ms2ger:IterableContext, r=jdm
Remove the IterableContext trait.
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 --faster` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).
Either:
- [ ] There are tests for these changes OR
- [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.
It serves no purpose.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11370)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/browsingcontext.rs')
-rw-r--r-- | components/script/dom/browsingcontext.rs | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/components/script/dom/browsingcontext.rs b/components/script/dom/browsingcontext.rs index c46afe71971..99c72e1e4be 100644 --- a/components/script/dom/browsingcontext.rs +++ b/components/script/dom/browsingcontext.rs @@ -164,25 +164,14 @@ impl BrowsingContext { self.active_index.set(0); self.history.borrow_mut().clear(); } -} - -pub struct ContextIterator { - stack: Vec<Root<BrowsingContext>>, -} -pub trait IterableContext { - fn iter(&self) -> ContextIterator; - fn find(&self, id: PipelineId) -> Option<Root<BrowsingContext>>; -} - -impl IterableContext for BrowsingContext { - fn iter(&self) -> ContextIterator { + pub fn iter(&self) -> ContextIterator { ContextIterator { stack: vec!(Root::from_ref(self)), } } - fn find(&self, id: PipelineId) -> Option<Root<BrowsingContext>> { + pub fn find(&self, id: PipelineId) -> Option<Root<BrowsingContext>> { if self.id == id { return Some(Root::from_ref(self)); } @@ -194,6 +183,10 @@ impl IterableContext for BrowsingContext { } } +pub struct ContextIterator { + stack: Vec<Root<BrowsingContext>>, +} + impl Iterator for ContextIterator { type Item = Root<BrowsingContext>; |