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

Android: Introduce ServoSurface #21234

Merged
merged 3 commits into from Aug 1, 2018
Merged

Android: Introduce ServoSurface #21234

merged 3 commits into from Aug 1, 2018
+918 −426

Conversation

@paulrouget
Copy link
Contributor

paulrouget commented Jul 23, 2018 •
edited by SimonSapin

(WIP as it depends on 2 other PRs)

Depends on #21199. Only last commit matters.

r? @MortimerGoro

Please look at ServoSurface.java. The rest is mostly some refactoring to share as much code as possible with ServoView.

This change is Reviewable
@highfive
Copy link

highfive commented Jul 23, 2018

Heads up! This PR modifies the following files:

  • @wafflespeanut: python/servo/bootstrap_commands.py, python/servo/command_base.py, python/servo/testing_commands.py, python/servo/package_commands.py, python/servo/build_commands.py and 1 more
  • @edunham: .travis.yml
  • @aneeshusa: etc/ci/buildbot_steps.yml
@highfive
Copy link

highfive commented Jul 23, 2018

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@MortimerGoro
MortimerGoro requested changes Jul 24, 2018
View changes
support/android/apk/servoview/src/main/java/com/mozilla/servoview/ServoSurface.java Outdated
throw new RuntimeException("Error: eglConfig() not Initialized");
}
int[] attrib_list = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL14.EGL_NONE};
mEglContext = EGL14.eglCreateContext(mEglDisplay, maEGLConfigs[0], EGL14.EGL_NO_CONTEXT, attrib_list, 0);

This comment has been minimized.

Sign in to view
@MortimerGoro

MortimerGoro Jul 24, 2018

Contributor

Check here if mEglContext is EGL_NO_CONTEXT for better error handling
@paulrouget paulrouget force-pushed the paulrouget:surface branch 3 times, most recently from 1e9c928 to 27c0025 Jul 27, 2018
@paulrouget
Copy link
Contributor Author

paulrouget commented Jul 27, 2018

@MortimerGoro done.
@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2018

☔ The latest upstream changes (presumably #21242) made this pull request unmergeable. Please resolve the merge conflicts.
@paulrouget paulrouget force-pushed the paulrouget:surface branch 2 times, most recently from 449762f to 56da1f6 Jul 30, 2018
@paulrouget
Copy link
Contributor Author

paulrouget commented Jul 30, 2018

@MortimerGoro can you give me a final review on the last commit?

This has been tested with Crow.
@bors-servo
Copy link
Contributor

bors-servo commented Jul 30, 2018

☔ The latest upstream changes (presumably #21250) made this pull request unmergeable. Please resolve the merge conflicts.
paulrouget added 3 commits Jul 18, 2018
@paulrouget
Build a AAR archive alongside the APK
Loading status checks…
e8af185
@paulrouget
Add make_current to libsimpleservo
02983ef
@paulrouget
Introduce ServoSurface
Loading status checks…
c36b165
@paulrouget paulrouget force-pushed the paulrouget:surface branch from 56da1f6 to c36b165 Aug 1, 2018
@paulrouget paulrouget changed the title [WIP] Android: Introduce ServoSurface Android: Introduce ServoSurface Aug 1, 2018
@MortimerGoro
MortimerGoro approved these changes Aug 1, 2018
View changes
@paulrouget
Copy link
Contributor Author

paulrouget commented Aug 1, 2018

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

bors-servo commented Aug 1, 2018

📌 Commit c36b165 has been approved by MortimerGoro
@bors-servo
Copy link
Contributor

bors-servo commented Aug 1, 2018

⌛ Testing commit c36b165 with merge 0748842...
bors-servo added a commit that referenced this pull request Aug 1, 2018
@bors-servo
Auto merge of #21234 - paulrouget:surface, r=MortimerGoro
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…
0748842 
Android: Introduce ServoSurface

(WIP as it depends on 2 other PRs)

Depends on #21199. Only last commit matters.

r? @MortimerGoro

Please look at ServoSurface.java. The rest is mostly some refactoring to share as much code as possible with ServoView.

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

bors-servo commented Aug 1, 2018

💔 Test failed - mac-rel-wpt1
@jdm
Copy link
Member

jdm commented Aug 1, 2018

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

bors-servo commented Aug 1, 2018

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

bors-servo commented Aug 1, 2018

💔 Test failed - mac-rel-wpt1
@jdm
Copy link
Member

jdm commented Aug 1, 2018

@bors-servo retry

  • fixed window server issue on mac4
@bors-servo
Copy link
Contributor

bors-servo commented Aug 1, 2018

⌛ Testing commit c36b165 with merge 733552d...
bors-servo added a commit that referenced this pull request Aug 1, 2018
@bors-servo
Auto merge of #21234 - paulrouget:surface, r=MortimerGoro
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…
733552d 
Android: Introduce ServoSurface

(WIP as it depends on 2 other PRs)

Depends on #21199. Only last commit matters.

r? @MortimerGoro

Please look at ServoSurface.java. The rest is mostly some refactoring to share as much code as possible with ServoView.

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

bors-servo commented Aug 1, 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: MortimerGoro
Pushing 733552d to master...
@bors-servo bors-servo merged commit c36b165 into servo:master Aug 1, 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MortimerGoro MortimerGoro

Assignees

@MortimerGoro MortimerGoro

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@paulrouget @highfive @bors-servo @jdm @MortimerGoro
You can’t perform that action at this time.