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

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

Conversation

paulrouget
Copy link
Contributor

@paulrouget paulrouget commented Jul 23, 2018

(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

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 highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jul 23, 2018
@highfive
Copy link

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!

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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check here if mEglContext is EGL_NO_CONTEXT for better error handling

@paulrouget paulrouget force-pushed the surface branch 3 times, most recently from 1e9c928 to 27c0025 Compare July 27, 2018 05:14
@paulrouget
Copy link
Contributor Author

@MortimerGoro done.

@bors-servo
Copy link
Contributor

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Jul 28, 2018
@paulrouget paulrouget force-pushed the surface branch 2 times, most recently from 449762f to 56da1f6 Compare July 30, 2018 14:43
@paulrouget
Copy link
Contributor Author

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

This has been tested with Crow.

@bors-servo
Copy link
Contributor

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Jul 30, 2018
@paulrouget paulrouget changed the title [WIP] Android: Introduce ServoSurface Android: Introduce ServoSurface Aug 1, 2018
@paulrouget
Copy link
Contributor Author

@bors-servo r=MortimerGoro

@bors-servo
Copy link
Contributor

📌 Commit c36b165 has been approved by MortimerGoro

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. S-needs-rebase There are merge conflict errors. labels Aug 1, 2018
@bors-servo
Copy link
Contributor

⌛ Testing commit c36b165 with merge 0748842...

bors-servo pushed a commit that referenced this pull request Aug 1, 2018
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

💔 Test failed - mac-rel-wpt1

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Aug 1, 2018
@jdm
Copy link
Member

jdm commented Aug 1, 2018

@bors-servo retry

@bors-servo
Copy link
Contributor

@bors-servo
Copy link
Contributor

💔 Test failed - mac-rel-wpt1

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Aug 1, 2018
@jdm
Copy link
Member

jdm commented Aug 1, 2018

@bors-servo retry

  • fixed window server issue on mac4

@bors-servo
Copy link
Contributor

⌛ Testing commit c36b165 with merge 733552d...

bors-servo pushed a commit that referenced this pull request Aug 1, 2018
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 -->
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Aug 1, 2018
@bors-servo
Copy link
Contributor

☀️ 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
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Aug 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants