Skip to content

/ servo

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
Merged

Get the right pixel density on Android #21774

merged 1 commit into from Sep 24, 2018

Conversation

@paulrouget
Copy link
Contributor

paulrouget commented Sep 21, 2018 •
edited by atouchet

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
Copy link
Member

jdm commented Sep 21, 2018 •
edited

Need to update capi.rs as well. r=me otherwise.
@bors-servo
Copy link
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
Copy link
Contributor Author

paulrouget commented Sep 23, 2018

@bors-servo r=jdm
@bors-servo
Copy link
Contributor

bors-servo commented Sep 23, 2018

📌 Commit 327c1a4 has been approved by jdm
@highfive highfive assigned jdm and unassigned SimonSapin Sep 23, 2018
@bors-servo
Copy link
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
@bors-servo
Auto merge of #21774 - paulrouget:pixel-density-android, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
3e805c4 
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
Copy link
Contributor

bors-servo commented Sep 23, 2018

💔 Test failed - windows-msvc-dev
@CYBAI
Copy link
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
Get the right pixel density on Android
Loading status checks…
96cf1e2
@paulrouget paulrouget force-pushed the paulrouget:pixel-density-android branch from 327c1a4 to 96cf1e2 Sep 24, 2018
@paulrouget
Copy link
Contributor Author

paulrouget commented Sep 24, 2018

@bors-servo r=jdm
@bors-servo
Copy link
Contributor

bors-servo commented Sep 24, 2018

📌 Commit 96cf1e2 has been approved by jdm
@bors-servo
Copy link
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
@bors-servo
Auto merge of #21774 - paulrouget:pixel-density-android, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
c5708ce 
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
Copy link
Contributor

bors-servo commented Sep 24, 2018

💔 Test failed - linux-rel-wpt
@CYBAI
Copy link
Collaborator

CYBAI commented Sep 24, 2018

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Sep 24, 2018

⚡ Previous build results for android, android-x86, arm32, arm64, linux-dev, linux-rel-css, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev are reusable. Rebuilding only linux-rel-wpt...
@bors-servo
Copy link
Contributor

bors-servo commented Sep 24, 2018

☀️ Test successful - android, android-x86, 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 c5708ce to master...
@bors-servo bors-servo merged commit 96cf1e2 into servo:master Sep 24, 2018
3 of 4 checks passed
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 mentioned this pull request Sep 24, 2018
Merged
3 of 3 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
S-tests-failed
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

Set pixel density to 1 by default for Android Surface.
Android: properly set the pixel density
6 participants
@paulrouget @jdm @bors-servo @CYBAI @SimonSapin @highfive
You can’t perform that action at this time.