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

Update WR (radial gradients, generate_frame API, mac subpixel improvements, ANGLE shader support). #15111

Merged
merged 1 commit into from Jan 31, 2017

Conversation

@glennw
Copy link
Member

glennw commented Jan 19, 2017

This change is Reviewable

@glennw
Copy link
Member Author

glennw commented Jan 19, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Jan 19, 2017

Trying commit 6b3b082 with merge 315da6b...

bors-servo added a commit that referenced this pull request Jan 19, 2017
Update WR (radial gradients, generate_frame API, mac subpixel improvements, ANGLE shader support).

<!-- 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/15111)
<!-- Reviewable:end -->
@Ms2ger
Copy link
Contributor

Ms2ger commented Jan 19, 2017

./Cargo.lock:1: duplicate versions for package `core-graphics`
	The following packages depend on version 0.4.2 from 'crates.io':
		azure
		cocoa
		core-text
		gfx
		servo-glutin
	The following packages depend on version 0.5.0 from 'crates.io':
		webrender
		webrender_traits
@glennw
Copy link
Member Author

glennw commented Jan 19, 2017

@Ms2ger Ugh - I guess that means this can't land until those other packages are updated to 0.5.0? That's unfortunate timing :|

@bors-servo
Copy link
Contributor

bors-servo commented Jan 19, 2017

💔 Test failed - mac-dev-unit

@Manishearth
Copy link
Member

Manishearth commented Jan 19, 2017

r=me when conflcits are resolved

@jdm
Copy link
Member

jdm commented Jan 19, 2017

All other packages are published. This should be ready to go.

@Manishearth
Copy link
Member

Manishearth commented Jan 19, 2017

Ooh radial gradiants, finally 😀

@glennw glennw force-pushed the glennw:wr-update-generate branch from 6b3b082 to e216cfa Jan 19, 2017
@glennw
Copy link
Member Author

glennw commented Jan 19, 2017

r? @jdm or anyone.

@highfive highfive assigned jdm and unassigned Manishearth Jan 19, 2017
@jdm
Copy link
Member

jdm commented Jan 19, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Jan 19, 2017

📌 Commit e216cfa has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Jan 19, 2017

Testing commit e216cfa with merge a81a712...

bors-servo added a commit that referenced this pull request Jan 19, 2017
Update WR (radial gradients, generate_frame API, mac subpixel improvements, ANGLE shader support).

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

bors-servo commented Jan 19, 2017

💔 Test failed - linux-rel-css

@glennw
Copy link
Member Author

glennw commented Jan 19, 2017

@glennw
Copy link
Member Author

glennw commented Jan 20, 2017

@bors-servo r- try clean

@Ms2ger
Copy link
Contributor

Ms2ger commented Jan 20, 2017

@bors-servo try- clean r=jdm

bors-servo added a commit that referenced this pull request Jan 30, 2017
Update WR (radial gradients, generate_frame API, mac subpixel improvements, ANGLE shader support).

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

bors-servo commented Jan 30, 2017

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

@glennw glennw force-pushed the glennw:wr-update-generate branch from 07b023e to 07b0d7e Jan 30, 2017
@glennw
Copy link
Member Author

glennw commented Jan 30, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Jan 30, 2017

Trying commit 07b0d7e with merge ed0e5e1...

bors-servo added a commit that referenced this pull request Jan 30, 2017
Update WR (radial gradients, generate_frame API, mac subpixel improvements, ANGLE shader support).

<!-- 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/15111)
<!-- Reviewable:end -->
@glennw glennw force-pushed the glennw:wr-update-generate branch from 07b0d7e to 97589de Jan 31, 2017
@glennw
Copy link
Member Author

glennw commented Jan 31, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Jan 31, 2017

Trying commit 97589de with merge d73f364...

bors-servo added a commit that referenced this pull request Jan 31, 2017
Update WR (radial gradients, generate_frame API, mac subpixel improvements, ANGLE shader support).

<!-- 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/15111)
<!-- Reviewable:end -->
@glennw
Copy link
Member Author

glennw commented Jan 31, 2017

r? @pcwalton or anyone

@@ -33,6 +33,25 @@ use webrender_traits;
/// MAYBE(Yoric):
/// * For faster lookups, it might be useful to store the LoadKey in the DOM once we have performed a first load.

// TODO(gw): This is a port of the old is_image_opaque code from WR.

This comment has been minimized.

@pcwalton

pcwalton Jan 31, 2017

Contributor

Add a comment saying that this is slow and needs SIMD

This comment has been minimized.

@glennw

glennw Jan 31, 2017

Author Member

Fixed

@glennw glennw force-pushed the glennw:wr-update-generate branch from 97589de to 4cbefe8 Jan 31, 2017
@pcwalton
Copy link
Contributor

pcwalton commented Jan 31, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Jan 31, 2017

📌 Commit 4cbefe8 has been approved by pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Jan 31, 2017

Testing commit 4cbefe8 with merge 8421ae6...

bors-servo added a commit that referenced this pull request Jan 31, 2017
Update WR (radial gradients, generate_frame API, mac subpixel improvements, ANGLE shader support).

<!-- 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/15111)
<!-- Reviewable:end -->
@bors-servo bors-servo merged commit 4cbefe8 into servo:master Jan 31, 2017
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@glennw glennw deleted the glennw:wr-update-generate branch Jan 31, 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.