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

Prevent use of reserved names in BindAttribLocation #10652

Merged
merged 1 commit into from Apr 19, 2016
Merged

Prevent use of reserved names in BindAttribLocation #10652

merged 1 commit into from Apr 19, 2016

Conversation

@dzbarsky
Copy link
Member

dzbarsky commented Apr 16, 2016

(Depend on the WebGL tests landing)

This change is Reviewable
@highfive
Copy link

highfive commented Apr 16, 2016

Heads up! This PR modifies the following files:

  • @KiChjang: components/script/dom/webglprogram.rs
  • @emilio: components/script/dom/webglprogram.rs
@emilio emilio assigned emilio and unassigned SimonSapin Apr 16, 2016
@emilio
Copy link
Member

emilio commented Apr 16, 2016

@bors-servo: delegate+

Good catch!
@bors-servo
Copy link
Contributor

bors-servo commented Apr 16, 2016

✌️ @dzbarsky can now approve this pull request
@bors-servo
Copy link
Contributor

bors-servo commented Apr 16, 2016

☔ The latest upstream changes (presumably #10373) made this pull request unmergeable. Please resolve the merge conflicts.
@dzbarsky dzbarsky force-pushed the dzbarsky:reserved branch from c94dfa3 to 36b97aa Apr 16, 2016
@dzbarsky
Copy link
Member Author

dzbarsky commented Apr 16, 2016

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Apr 16, 2016

📌 Commit 36b97aa has been approved by dzbarsky
@dzbarsky dzbarsky force-pushed the dzbarsky:reserved branch from 36b97aa to d76e39a Apr 16, 2016
@dzbarsky dzbarsky force-pushed the dzbarsky:reserved branch 2 times, most recently from 38f4030 to a67a744 Apr 16, 2016
@dzbarsky
Prevent use of reserved names in BindAttribLocation
Loading status checks…
a67a744
@dzbarsky
Copy link
Member Author

dzbarsky commented Apr 17, 2016

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Apr 17, 2016

📌 Commit a67a744 has been approved by dzbarsky
@bors-servo
Copy link
Contributor

bors-servo commented Apr 17, 2016

⌛ Testing commit a67a744 with merge 977e891...
bors-servo added a commit that referenced this pull request Apr 17, 2016
@bors-servo
Auto merge of #10652 - dzbarsky:reserved, r=dzbarsky
Loading status checks…
977e891 
Prevent use of reserved names in BindAttribLocation

(Depend on the WebGL tests landing)

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10652)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 17, 2016

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

jdm commented Apr 17, 2016 

  ▶ OK [expected CRASH] /webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-G_I.html

  ▶ Unexpected subtest result in /webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-G_I.html:
  │ FAIL [expected PASS] WebGL test #0: testValidArgs
  │   → assert_true: testValidArgs expected true got false
  │ 
  │ reportTestResultsToHarness/<@http://web-platform.test:8000/webgl/conformance-1.0.3/conformance/more/unit.js:900:7
  │ Test.prototype.step@http://web-platform.test:8000/resources/testharness.js:1381:20
  │ test@http://web-platform.test:8000/resources/testharness.js:495:9
  │ reportTestResultsToHarness@http://web-platform.test:8000/webgl/conformance-1.0.3/conformance/more/unit.js:899:1
  │ runTests@http://web-platform.test:8000/webgl/conformance-1.0.3/conformance/more/unit.js:188:5
  │ initTests@http://web-platform.test:8000/webgl/conformance-1.0.3/conformance/more/unit.js:922:5
  └ @http://web-platform.test:8000/webgl/conformance-1.0.3/conformance/more/unit.js:947:7
@dzbarsky
Copy link
Member Author

dzbarsky commented Apr 19, 2016

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Apr 19, 2016

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
  • There's another pull request that is currently being tested, blocking this pull request: #10695
@bors-servo
Copy link
Contributor

bors-servo commented Apr 19, 2016

📌 Commit a67a744 has been approved by dzbarsky
@dzbarsky
Copy link
Member Author

dzbarsky commented Apr 19, 2016

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

bors-servo commented Apr 19, 2016

⌛ Testing commit a67a744 with merge 82b952c...
bors-servo added a commit that referenced this pull request Apr 19, 2016
@bors-servo
Auto merge of #10652 - dzbarsky:reserved, r=dzbarsky
Loading status checks…
82b952c 
Prevent use of reserved names in BindAttribLocation

(Depend on the WebGL tests landing)

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10652)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 19, 2016

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit a67a744 into servo:master Apr 19, 2016
3 checks passed
3 checks passed
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
No reviews
Assignees

@emilio emilio

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@dzbarsky @highfive @emilio @bors-servo @jdm @SimonSapin
You can’t perform that action at this time.