Auto merge of #7893 - Ms2ger:img-webdriver, r=jdm
Auto merge of #7893 - Ms2ger:img-webdriver, r=jdm

Cleanup handle_take_screenshot.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7893)
<!-- Reviewable:end -->

steveklabnik/servo,SimonSapin/servo,szeged/servo,upsuper/servo,pyfisch/servo,mbrubeck/servo,anthgur/servo,paulrouget/servo,cbrewster/servo,KiChjang/servo,cbrewster/servo,anthgur/servo,KiChjang/servo,nnethercote/servo,peterjoel/servo,fiji-flo/servo,DominoTree/servo,nrc/servo,splav/servo,dati91/servo,upsuper/servo,fiji-flo/servo,dsandeephegde/servo,avadacatavra/servo,larsbergstrom/servo,paulrouget/servo,jimberlage/servo,pyfisch/servo,SimonSapin/servo,larsbergstrom/servo,SimonSapin/servo,nnethercote/servo,dsandeephegde/servo,mbrubeck/servo,jimberlage/servo,sadmansk/servo,nrc/servo,dsandeephegde/servo,splav/servo,larsbergstrom/servo,cbrewster/servo,rnestler/servo,avadacatavra/servo,ConnorGBrewster/servo,CJ8664/servo,DominoTree/servo,saneyuki/servo,rnestler/servo,avadacatavra/servo,saneyuki/servo,CJ8664/servo,nnethercote/servo,szeged/servo,jimberlage/servo,nnethercote/servo,steveklabnik/servo,ConnorGBrewster/servo,thiagopnts/servo,paulrouget/servo,peterjoel/servo,splav/servo,szeged/servo,emilio/servo,dsandeephegde/servo,jimberlage/servo,dsandeephegde/servo,steveklabnik/servo,ConnorGBrewster/servo,emilio/servo,larsbergstrom/servo,splav/servo,splav/servo,eddyb/servo,rnestler/servo,eddyb/servo,sadmansk/servo,thiagopnts/servo,KiChjang/servo,peterjoel/servo,mattnenterprise/servo,KiChjang/servo,anthgur/servo,mbrubeck/servo,emilio/servo,dsandeephegde/servo,ConnorGBrewster/servo,saneyuki/servo,emilio/servo,peterjoel/servo,canaltinova/servo,DominoTree/servo,sadmansk/servo,saneyuki/servo,pyfisch/servo,saneyuki/servo,splav/servo,SimonSapin/servo,paulrouget/servo,upsuper/servo,pyfisch/servo,eddyb/servo,peterjoel/servo,sadmansk/servo,jimberlage/servo,mattnenterprise/servo,paulrouget/servo,saneyuki/servo,fiji-flo/servo,emilio/servo,eddyb/servo,canaltinova/servo,emilio/servo,eddyb/servo,eddyb/servo,thiagopnts/servo,mattnenterprise/servo,canaltinova/servo,nnethercote/servo,cbrewster/servo,pyfisch/servo,steveklabnik/servo,dati91/servo,paulrouget/servo,thiagopnts/servo,DominoTree/servo,steveklabnik/servo,DominoTree/servo,dati91/servo,mattnenterprise/servo,nnethercote/servo,splav/servo,canaltinova/servo,notriddle/servo,canaltinova/servo,DominoTree/servo,SimonSapin/servo,szeged/servo,peterjoel/servo,eddyb/servo,notriddle/servo,SimonSapin/servo,canaltinova/servo,larsbergstrom/servo,KiChjang/servo,thiagopnts/servo,nrc/servo,thiagopnts/servo,fiji-flo/servo,KiChjang/servo,pyfisch/servo,ConnorGBrewster/servo,mbrubeck/servo,larsbergstrom/servo,cbrewster/servo,anthgur/servo,peterjoel/servo,dati91/servo,szeged/servo,fiji-flo/servo,larsbergstrom/servo,KiChjang/servo,notriddle/servo,nrc/servo,eddyb/servo,pyfisch/servo,rnestler/servo,avadacatavra/servo,saneyuki/servo,pyfisch/servo,CJ8664/servo,mattnenterprise/servo,paulrouget/servo,avadacatavra/servo,larsbergstrom/servo,notriddle/servo,steveklabnik/servo,peterjoel/servo,szeged/servo,nnethercote/servo,mattnenterprise/servo,peterjoel/servo,cbrewster/servo,larsbergstrom/servo,saneyuki/servo,emilio/servo,peterjoel/servo,CJ8664/servo,mattnenterprise/servo,pyfisch/servo,ConnorGBrewster/servo,pyfisch/servo,sadmansk/servo,KiChjang/servo,SimonSapin/servo,notriddle/servo,splav/servo,mbrubeck/servo,CJ8664/servo,thiagopnts/servo,anthgur/servo,jimberlage/servo,paulrouget/servo,szeged/servo,fiji-flo/servo,nrc/servo,sadmansk/servo,avadacatavra/servo,paulrouget/servo,dati91/servo,thiagopnts/servo,anthgur/servo,mbrubeck/servo,ConnorGBrewster/servo,notriddle/servo,cbrewster/servo,dsandeephegde/servo,jimberlage/servo,avadacatavra/servo,upsuper/servo,DominoTree/servo,sadmansk/servo,jimberlage/servo,mbrubeck/servo,larsbergstrom/servo,upsuper/servo,avadacatavra/servo,saneyuki/servo,DominoTree/servo,saneyuki/servo,anthgur/servo,nnethercote/servo,ConnorGBrewster/servo,emilio/servo,notriddle/servo,dati91/servo,DominoTree/servo,notriddle/servo,canaltinova/servo,mattnenterprise/servo,nrc/servo,jimberlage/servo,notriddle/servo,upsuper/servo,rnestler/servo,KiChjang/servo,CJ8664/servo,mbrubeck/servo,CJ8664/servo,paulrouget/servo,cbrewster/servo,emilio/servo,nrc/servo,fiji-flo/servo,upsuper/servo,nnethercote/servo,dsandeephegde/servo,notriddle/servo,splav/servo,sadmansk/servo,steveklabnik/servo,anthgur/servo,dati91/servo,rnestler/servo,DominoTree/servo,rnestler/servo,nnethercote/servo,SimonSapin/servo,CJ8664/servo,canaltinova/servo,szeged/servo,fiji-flo/servo,szeged/servo,KiChjang/servo,emilio/servo,dati91/servo,szeged/servo,rnestler/servo,splav/servo,upsuper/servo