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

Revert "Auto merge of #18114 - emilio:revert-webgl-refactor, r=nox" #18118

Merged
merged 1 commit into from Aug 17, 2017

Conversation

@nox
Copy link
Member

nox commented Aug 16, 2017

This reverts commit 4d10d39, reversing
changes made to ee94e2b.


This change is Reviewable

This reverts commit 4d10d39, reversing
changes made to ee94e2b.
@highfive
Copy link

highfive commented Aug 16, 2017

Heads up! This PR modifies the following files:

  • @asajeffrey: components/constellation/pipeline.rs, components/constellation/lib.rs, components/constellation/Cargo.toml, components/constellation/constellation.rs
  • @KiChjang: components/script/dom/webglframebuffer.rs, components/script/dom/webglshader.rs, components/script/dom/webgl_validations/tex_image_2d.rs, components/script/dom/htmlcanvaselement.rs, components/script/dom/window.rs and 24 more
  • @fitzgen: components/script/dom/webglframebuffer.rs, components/script/dom/webglshader.rs, components/script/dom/webgl_validations/tex_image_2d.rs, components/script/dom/htmlcanvaselement.rs, components/script/dom/window.rs and 24 more
  • @emilio: components/layout/display_list_builder.rs, components/script/dom/webglframebuffer.rs, components/script/dom/webglshader.rs, components/script/dom/webgl_validations/tex_image_2d.rs, components/layout/webrender_helpers.rs and 14 more
@highfive
Copy link

highfive commented Aug 16, 2017

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify gfx, layout, and script code, but no tests are modified. Please consider adding a test!
@nox
Copy link
Member Author

nox commented Aug 16, 2017

@bors-servo r=emilio

@bors-servo
Copy link
Contributor

bors-servo commented Aug 16, 2017

📌 Commit 676f2c8 has been approved by emilio

@highfive highfive assigned emilio and unassigned cbrewster Aug 16, 2017
@atouchet atouchet mentioned this pull request Aug 16, 2017
3 of 5 tasks complete
@glennw
Copy link
Member

glennw commented Aug 16, 2017

@MortimerGoro Once this lands (and sticks) are you happy for me to remove all the webgl related code in WR?

@MortimerGoro
Copy link
Contributor

MortimerGoro commented Aug 16, 2017

@glennw Yes ;)

@bors-servo
Copy link
Contributor

bors-servo commented Aug 17, 2017

Testing commit 676f2c8 with merge c681d4e...

bors-servo added a commit that referenced this pull request Aug 17, 2017
Revert "Auto merge of #18114 - emilio:revert-webgl-refactor, r=nox"

This reverts commit 4d10d39, reversing
changes made to ee94e2b.

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

bors-servo commented Aug 17, 2017

💔 Test failed - android

@jdm
Copy link
Member

jdm commented Aug 17, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Aug 17, 2017

Testing commit 676f2c8 with merge fbabcaf...

bors-servo added a commit that referenced this pull request Aug 17, 2017
Revert "Auto merge of #18114 - emilio:revert-webgl-refactor, r=nox"

This reverts commit 4d10d39, reversing
changes made to ee94e2b.

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

bors-servo commented Aug 17, 2017

@bors-servo bors-servo merged commit 676f2c8 into master Aug 17, 2017
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@SimonSapin SimonSapin deleted the oops-webgl branch Aug 29, 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

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