Re-expose webrender debugger feature in components/servo #20328

Moggers · 2018-03-18T08:54:49Z

./mach build -d does not report any errors
./mach test-tidy does not report any errors

Checking files for tidiness...
./Cargo.lock:1: duplicate versions for package `base64`
	The following packages depend on version 0.3.1 from 'crates.io':
		webrender
	The following packages depend on version 0.6.0 from 'crates.io':
		hyper
		net
		script
		webdriver_server
./Cargo.lock:1: duplicate versions for package `bytes`
	The following packages depend on version 0.3.0 from 'crates.io':
		ws
	The following packages depend on version 0.4.6 from 'crates.io':
		ws
./Cargo.lock:1: duplicate versions for package `ws`
	The following packages depend on version 0.6.0 from 'crates.io':
		debugger
	The following packages depend on version 0.7.3 from 'crates.io':
		webrender
./Cargo.lock:1: duplicate versions for package `image`
	The following packages depend on version 0.17.0 from 'crates.io':
		webrender
	The following packages depend on version 0.18.0 from 'crates.io':
		compositing
		net_traits
		script
		webdriver_server

What should I do about this?

These changes fix #20324 (github issue number if applicable).

There are tests for these changes OR
These changes do not require tests because: Not sure actually, do I need to write integration tests to make sure it builds with the feature enabled?

This change is

highfive · 2018-03-18T08:54:55Z

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @asajeffrey (or someone else) soon.

highfive · 2018-03-18T08:54:55Z

Heads up! This PR modifies the following files:

@paulrouget: components/servo/Cargo.toml

jdm · 2018-03-18T13:41:17Z

To address that someone needs to update https://github.com/servo/webrender/blob/master/webrender/Cargo.toml#L39 to 0.6.0 (for bytes, for example) and update the version of webrender that's in use in Servo.

Moggers · 2018-03-18T17:18:54Z

I've updated components/debugger ws dependency to 0.7.3.

Moggers · 2018-03-18T17:37:39Z

I've opened an issue for the dependency versions on the webrender repo.

servo/webrender#2538

Moggers · 2018-03-19T13:18:51Z

Test-tidy issue should be resolved now.

jdm · 2018-03-19T13:23:29Z

We're still one revision behind 46b7fb3d58cc89b1c8683524d0829ef266c8b73c in webrender, unfortunately.


        Auto merge of #20341 - servo:jdm-patch-10, r=jdm

Update WR revision. This updates some WR debugger dependencies that are trailing behind servo. Needed for #20328.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20341)

jdm · 2018-03-19T16:54:29Z

@bors-servo r+

bors-servo · 2018-03-19T16:54:30Z

📌 Commit 42d41e4 has been approved by jdm

bors-servo · 2018-03-19T17:48:52Z

⌛ Testing commit 42d41e4 with merge d90e0a2...


        Auto merge of #20328 - Moggers:enable-debugger, r=jdm

Re-expose webrender debugger feature in components/servo  ---  - [x] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors ``` Checking files for tidiness... ./Cargo.lock:1: duplicate versions for package `base64` The following packages depend on version 0.3.1 from 'crates.io': webrender The following packages depend on version 0.6.0 from 'crates.io': hyper net script webdriver_server ./Cargo.lock:1: duplicate versions for package `bytes` The following packages depend on version 0.3.0 from 'crates.io': ws The following packages depend on version 0.4.6 from 'crates.io': ws ./Cargo.lock:1: duplicate versions for package `ws` The following packages depend on version 0.6.0 from 'crates.io': debugger The following packages depend on version 0.7.3 from 'crates.io': webrender ./Cargo.lock:1: duplicate versions for package `image` The following packages depend on version 0.17.0 from 'crates.io': webrender The following packages depend on version 0.18.0 from 'crates.io': compositing net_traits script webdriver_server ``` What should I do about this? - [x] These changes fix #20324 (github issue number if applicable).  - [ ] There are tests for these changes OR - [x] These changes do not require tests because: Not sure actually, do I need to write integration tests to make sure it builds with the feature enabled?    --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20328)

bors-servo · 2018-03-19T18:08:03Z

💔 Test failed - mac-dev-unit

jdm · 2018-03-19T18:36:39Z

You'll need to rebase on master, start the build, then commit the changes to Cargo.lock.

jdm · 2018-03-19T21:46:38Z

@bors-servo r+

bors-servo · 2018-03-19T21:46:39Z

📌 Commit 4dadfd0 has been approved by jdm

bors-servo · 2018-03-19T21:46:43Z

⌛ Testing commit 4dadfd0 with merge e9fdcdc...


        Auto merge of #20328 - Moggers:enable-debugger, r=jdm

Re-expose webrender debugger feature in components/servo  ---  - [x] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors ``` Checking files for tidiness... ./Cargo.lock:1: duplicate versions for package `base64` The following packages depend on version 0.3.1 from 'crates.io': webrender The following packages depend on version 0.6.0 from 'crates.io': hyper net script webdriver_server ./Cargo.lock:1: duplicate versions for package `bytes` The following packages depend on version 0.3.0 from 'crates.io': ws The following packages depend on version 0.4.6 from 'crates.io': ws ./Cargo.lock:1: duplicate versions for package `ws` The following packages depend on version 0.6.0 from 'crates.io': debugger The following packages depend on version 0.7.3 from 'crates.io': webrender ./Cargo.lock:1: duplicate versions for package `image` The following packages depend on version 0.17.0 from 'crates.io': webrender The following packages depend on version 0.18.0 from 'crates.io': compositing net_traits script webdriver_server ``` What should I do about this? - [x] These changes fix #20324 (github issue number if applicable).  - [ ] There are tests for these changes OR - [x] These changes do not require tests because: Not sure actually, do I need to write integration tests to make sure it builds with the feature enabled?    --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20328)

bors-servo · 2018-03-19T22:42:09Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: jdm
Pushing e9fdcdc to master...


        Re-expose webrender debugger feature in components/servo

Update ws in debugger to 0.7.3 Update lockfile

highfive assigned asajeffrey Mar 18, 2018

highfive added the S-awaiting-review label Mar 18, 2018

Moggers mentioned this pull request Mar 18, 2018

Update dependency versions of `base64` and `image` to be inline with servo. servo/webrender#2538

Closed

jdm mentioned this pull request Mar 19, 2018

Update WR revision. #20341

Merged

highfive assigned jdm and unassigned asajeffrey Mar 19, 2018

highfive added S-awaiting-merge and removed S-awaiting-review labels Mar 19, 2018

highfive added S-tests-failed and removed S-awaiting-merge labels Mar 19, 2018

Moggers force-pushed the Moggers:enable-debugger branch from 42d41e4 to 4dadfd0 Mar 19, 2018

highfive added S-awaiting-review and removed S-tests-failed labels Mar 19, 2018

highfive removed the S-awaiting-review label Mar 19, 2018

highfive added the S-awaiting-merge label Mar 19, 2018

bors-servo merged commit 4dadfd0 into servo:master Mar 19, 2018
3 checks passed

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Mar 19, 2018

bors-servo mentioned this pull request Mar 19, 2018

Implement WebGL getUniform API #20330

Closed

3 of 4 tasks complete

Re-expose webrender debugger feature in components/servo

Loading status checks…

4dadfd0

Update ws in debugger to 0.7.3 Update lockfile

servo / servo

Re-expose webrender debugger feature in components/servo #20328

Re-expose webrender debugger feature in components/servo #20328

Moggers commented Mar 18, 2018 •

edited

highfive commented Mar 18, 2018

highfive commented Mar 18, 2018

jdm commented Mar 18, 2018 •

edited

Moggers commented Mar 18, 2018

Moggers commented Mar 18, 2018

Moggers commented Mar 19, 2018

jdm commented Mar 19, 2018

jdm commented Mar 19, 2018

bors-servo commented Mar 19, 2018

bors-servo commented Mar 19, 2018

bors-servo commented Mar 19, 2018

jdm commented Mar 19, 2018

jdm commented Mar 19, 2018

bors-servo commented Mar 19, 2018

bors-servo commented Mar 19, 2018

bors-servo commented Mar 19, 2018

servo / servo

Join GitHub today

Re-expose webrender debugger feature in components/servo #20328

Re-expose webrender debugger feature in components/servo #20328

Conversation

Moggers commented Mar 18, 2018 • edited

highfive commented Mar 18, 2018

highfive commented Mar 18, 2018

jdm commented Mar 18, 2018 • edited

Moggers commented Mar 18, 2018

Moggers commented Mar 18, 2018

Moggers commented Mar 19, 2018

jdm commented Mar 19, 2018

jdm commented Mar 19, 2018

bors-servo commented Mar 19, 2018

bors-servo commented Mar 19, 2018

bors-servo commented Mar 19, 2018

jdm commented Mar 19, 2018

jdm commented Mar 19, 2018

bors-servo commented Mar 19, 2018

bors-servo commented Mar 19, 2018

bors-servo commented Mar 19, 2018

Moggers commented Mar 18, 2018 •

edited

jdm commented Mar 18, 2018 •

edited