Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Update WR (various optimizations, color image support). #21412

Closed
wants to merge 1 commit into from

Conversation

@gw3583
Copy link
Contributor

gw3583 commented Aug 15, 2018

This change is Reviewable

@highfive
Copy link

highfive commented Aug 15, 2018

Heads up! This PR modifies the following files:

  • @emilio: components/layout/display_list/webrender_helpers.rs
@highfive
Copy link

highfive commented Aug 15, 2018

warning Warning warning

  • These commits modify layout code, but no tests are modified. Please consider adding a test!
@gw3583
Copy link
Contributor Author

gw3583 commented Aug 15, 2018

This contains the minimal API changes on WR master for the next Servo update.

The current state is that it fails tidy (log below) and crashes on startup (I think due to the different ipc-channel versions that are present).

Nonetheless, it might be a useful starting point for working out what dependencies need to be updated.

Checking the config file...
Checking the wpt manifest file...
Checking directories for correct file extensions...
Checking files for tidiness...
./Cargo.lock:1: duplicate versions for package `ipc-channel`
        The following packages depend on version 0.10.0 from 'crates.io':
                bluetooth
                bluetooth_traits
                canvas
                canvas_traits
                compositing
                constellation
                devtools
                devtools_traits
                embedder_traits
                gfx
                layout
                layout_thread
                layout_traits
                libservo
                metrics
                metrics_tests
                net
                net_traits
                profile
                profile_tests
                profile_traits
                script
                script_layout_interface
                script_traits
                webdriver_server
                webvr
                webvr_traits
        The following packages depend on version 0.11.0 from 'crates.io':
                webrender_api
./Cargo.lock:1: duplicate versions for package `crossbeam-epoch`
        The following packages depend on version 0.3.1 from 'crates.io':
                crossbeam-deque
        The following packages depend on version 0.5.2 from 'crates.io':
                crossbeam-channel
./Cargo.lock:1: duplicate versions for package `crossbeam-utils`
        The following packages depend on version 0.2.2 from 'crates.io':
                crossbeam-deque
                crossbeam-epoch
        The following packages depend on version 0.5.0 from 'crates.io':
                crossbeam-channel
                crossbeam-epoch
./Cargo.lock:1: Package crossbeam-channel 0.2.4 depends on blocked package rand.
  Progress: 100% (2/2)
@jdm
Copy link
Member

jdm commented Aug 15, 2018

All of those duplicates come from servo/ipc-channel#183 and the new version of ipc-channel. #21325 is in the process of being negotiated to address that.

@bors-servo
Copy link
Contributor

bors-servo commented Aug 24, 2018

The latest upstream changes (presumably #21348) made this pull request unmergeable. Please resolve the merge conflicts.

@pyfisch
Copy link
Contributor

pyfisch commented Sep 15, 2018

See also #21725

@jdm
Copy link
Member

jdm commented Oct 10, 2018

This is happening in #21725.

@jdm jdm closed this Oct 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.