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

Update WR and the whole macOS crate stack #19314

Merged
merged 1 commit into from Nov 22, 2017
Merged

Update WR and the whole macOS crate stack #19314

merged 1 commit into from Nov 22, 2017

Conversation

@nox
Copy link
Member

nox commented Nov 21, 2017

This change is Reviewable

@highfive
Copy link

highfive commented Nov 21, 2017

Heads up! This PR modifies the following files:

@highfive
Copy link

highfive commented Nov 21, 2017

warning Warning warning

  • These commits modify gfx code, but no tests are modified. Please consider adding a test!
@nox
Copy link
Member Author

nox commented Nov 21, 2017

This fails to compile with:

error[E0407]: method `new_frame_ready` is not a member of trait `webrender_api::RenderNotifier`
   --> components/compositing/compositor.rs:332:5
    |
332 | /     fn new_frame_ready(&self) {
333 | |         self.compositor_proxy.recomposite(CompositingReason::NewWebRenderFrame);
334 | |     }
    | |_____^ not a member of trait `webrender_api::RenderNotifier`

error[E0407]: method `new_scroll_frame_ready` is not a member of trait `webrender_api::RenderNotifier`
   --> components/compositing/compositor.rs:336:5
    |
336 | /     fn new_scroll_frame_ready(&self, composite_needed: bool) {
337 | |         self.compositor_proxy.send(Msg::NewScrollFrameReady(composite_needed));
338 | |     }
    | |_____^ not a member of trait `webrender_api::RenderNotifier`

error[E0046]: not all trait items implemented, missing: `wake_up`, `new_document_ready`
   --> components/compositing/compositor.rs:327:1
    |
327 | / impl webrender_api::RenderNotifier for RenderNotifier {
328 | |     fn clone(&self) -> Box<webrender_api::RenderNotifier> {
329 | |         Box::new(RenderNotifier::new(self.compositor_proxy.clone()))
330 | |     }
...   |
338 | |     }
339 | | }
    | |_^ missing `wake_up`, `new_document_ready` in implementation
    |
    = note: `wake_up` from trait: `fn(&Self)`
    = note: `new_document_ready` from trait: `fn(&Self, webrender_api::DocumentId, bool, bool)`

error: aborting due to 3 previous errors

Still, I wanted to push it because I assume @glennw, @pcwalton or whoever will do the code changes will appreciate having the Cargo changes ready anyway.

@nox nox mentioned this pull request Nov 21, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Nov 21, 2017

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

@glennw
Copy link
Member

glennw commented Nov 21, 2017

@nox Thanks! I'll pick up work on this today.

@glennw
Copy link
Member

glennw commented Nov 21, 2017

@nox I've rebased this and added the necessary API changes patch.

The only remaining issue I know of is a test-tidy failure:

./Cargo.lock:1: duplicate versions for package `foreign-types`
	The following packages depend on version 0.2.0 from 'crates.io':
		openssl
	The following packages depend on version 0.3.0 from 'crates.io':
		core-graphics
		core-text
  Progress: 100% (5/5)
@glennw
Copy link
Member

glennw commented Nov 21, 2017

@nox Looks like the most recent version of openssl still uses foreign-types 0.2.0, so I guess we'll need to land a patch upstream for that?

@nox nox force-pushed the wr branch from 9e31032 to b27a324 Nov 21, 2017
@nox
Copy link
Member Author

nox commented Nov 21, 2017

I squashed everything and added foreign-types to the tidy exceptions. It's a small crate, not an issue.

@glennw glennw changed the title (WIP) Update WR and the whole macOS crate stack Update WR and the whole macOS crate stack Nov 21, 2017
@glennw
Copy link
Member

glennw commented Nov 21, 2017

@nox Thanks, this is ready to go now then, I think. r? @jdm

@highfive highfive assigned jdm and unassigned pcwalton Nov 21, 2017
@glennw
Copy link
Member

glennw commented Nov 21, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Nov 21, 2017

📌 Commit b27a324 has been approved by glennw

@bors-servo
Copy link
Contributor

bors-servo commented Nov 21, 2017

Testing commit b27a324 with merge e1a9086...

bors-servo added a commit that referenced this pull request Nov 21, 2017
Update WR and the whole macOS crate stack

<!-- 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/19314)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 21, 2017

💔 Test failed - mac-dev-unit

@jdm
Copy link
Member

jdm commented Nov 21, 2017

error[E0308]: mismatched types
  --> components/gfx/platform/macos/font_template.rs:64:64
   |
64 |                     let fontprov = CGDataProvider::from_buffer(bytes);
   |                                                                ^^^^^ expected struct `std::sync::Arc`, found reference
   |
   = note: expected type `std::sync::Arc<std::vec::Vec<u8>>`
              found type `&std::vec::Vec<u8>`

@nox
Copy link
Member Author

nox commented Nov 21, 2017

I will fix this.

@nox
Copy link
Member Author

nox commented Nov 21, 2017

r? @jdm

@highfive highfive assigned jdm and unassigned glennw Nov 21, 2017
@jdm
Copy link
Member

jdm commented Nov 22, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Nov 22, 2017

📌 Commit ba214bc has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Nov 22, 2017

Testing commit ba214bc with merge 37fa711...

bors-servo added a commit that referenced this pull request Nov 22, 2017
Update WR and the whole macOS crate stack

<!-- 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/19314)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 22, 2017

@bors-servo bors-servo merged commit ba214bc into master Nov 22, 2017
2 of 4 checks passed
2 of 4 checks passed
continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
dependency-ci Failed dependency checks
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@glennw glennw deleted the wr branch Nov 22, 2017
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

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