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

Get the right pixel density on Android #21774

Merged
merged 1 commit into from Sep 24, 2018

Conversation

Projects
None yet
6 participants
@paulrouget
Contributor

paulrouget commented Sep 21, 2018

Fix #21605 and fix #21504


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because _____

This change is Reviewable

@jdm

This comment has been minimized.

Member

jdm commented Sep 21, 2018

Need to update capi.rs as well. r=me otherwise.

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 21, 2018

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

@paulrouget paulrouget force-pushed the paulrouget:pixel-density-android branch 2 times, most recently from 8e0cfe7 to 327c1a4 Sep 23, 2018

@paulrouget

This comment has been minimized.

Contributor

paulrouget commented Sep 23, 2018

@bors-servo r=jdm

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 23, 2018

📌 Commit 327c1a4 has been approved by jdm

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 23, 2018

⌛️ Testing commit 327c1a4 with merge 3e805c4...

bors-servo added a commit that referenced this pull request Sep 23, 2018

Auto merge of #21774 - paulrouget:pixel-density-android, r=jdm
Get the right pixel density on Android

Fix #21605 and  #21504

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/21774)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 23, 2018

💔 Test failed - windows-msvc-dev

@CYBAI

This comment has been minimized.

Collaborator

CYBAI commented Sep 23, 2018

error[E0061]: this function takes 9 parameters but 8 parameters were supplied
  --> ports\libsimpleservo\src\capi.rs:94:5
   |
50 | / fn init(
51 | |     gl: Rc<gl::Gl>,
52 | |     args: *const c_char,
53 | |     url: *const c_char,
...  |
80 | |     ).unwrap();
81 | | }
   | |_- defined here
...
94 |       init(gl, args, url, wakeup, readfile, callbacks, width, height)
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 9 parameters

@paulrouget paulrouget force-pushed the paulrouget:pixel-density-android branch from 327c1a4 to 96cf1e2 Sep 24, 2018

@paulrouget

This comment has been minimized.

Contributor

paulrouget commented Sep 24, 2018

@bors-servo r=jdm

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 24, 2018

📌 Commit 96cf1e2 has been approved by jdm

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 24, 2018

⌛️ Testing commit 96cf1e2 with merge c5708ce...

bors-servo added a commit that referenced this pull request Sep 24, 2018

Auto merge of #21774 - paulrouget:pixel-density-android, r=jdm
Get the right pixel density on Android

Fix #21605 and fix #21504

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/21774)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 24, 2018

💔 Test failed - linux-rel-wpt

@CYBAI

This comment has been minimized.

Collaborator

CYBAI commented Sep 24, 2018

@bors-servo retry

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 24, 2018

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Sep 24, 2018

@bors-servo bors-servo merged commit 96cf1e2 into servo:master Sep 24, 2018

3 of 4 checks passed

Taskcluster (pull_request) TaskGroup: failure
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

@bors-servo bors-servo referenced this pull request Sep 24, 2018

Merged

Enable WebAudio on Android #21730

3 of 3 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment