diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-10-19 12:08:00 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-19 12:08:00 -0500 |
commit | 350c60b62d077cb19c4bd2cb7433c18ca08791bd (patch) | |
tree | 0a48837ebb25842e80e06884f23c4d6c96334613 /components/script/dom | |
parent | 31891b2377db30f56b69dc000a6bbeaef9d4b6f1 (diff) | |
parent | e19268c04ee29695305c979a35a7537df3b81566 (diff) | |
download | servo-350c60b62d077cb19c4bd2cb7433c18ca08791bd.tar.gz servo-350c60b62d077cb19c4bd2cb7433c18ca08791bd.zip |
Auto merge of #13827 - jdm:screenshot, r=Ms2ger
Support taking screenshots when a webdriver server is active.
Improve the experience of using webdriver to take screenshots of Servo. When a screenshot can't be obtained immediately, increase the delay before trying again from 2ms to 1s.
---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #13826
- [X] These changes do not require tests because we can't test webdriver yet.
<!-- 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/13827)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/window.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 5ee70b8b068..691d4c7606f 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -1124,7 +1124,9 @@ impl Window { // When all these conditions are met, notify the constellation // that this pipeline is ready to write the image (from the script thread // perspective at least). - if (opts::get().output_file.is_some() || opts::get().exit_after_load) && for_display { + if (opts::get().output_file.is_some() || + opts::get().exit_after_load || + opts::get().webdriver_port.is_some()) && for_display { let document = self.Document(); // Checks if the html element has reftest-wait attribute present. |