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

Fix twitter login crash. #303

Merged
merged 1 commit into from Jun 30, 2016
Merged

Fix twitter login crash. #303

merged 1 commit into from Jun 30, 2016

Conversation

@glennw
Copy link
Member

glennw commented Jun 30, 2016

This allows texture allocation to try multiple times, growing or adding texture pages as required.

});

match location {
Some(location) => {

This comment has been minimized.

@pcwalton

pcwalton Jun 30, 2016

Collaborator

nit: How about if let Some(location) = location { ... }? Since there's a return at the end, this should be equivalent, and then you can eliminate lots of rightward drift.

assert!(allocation_size.width < max_texture_size());
assert!(allocation_size.height < max_texture_size());

loop {

This comment has been minimized.

@pcwalton

pcwalton Jun 30, 2016

Collaborator

nit: I'd add a comment saying that you're looping to find a spot for the allocation, growing or adding pages as necessary.

if item.texture_id == last_page.texture_id {
item.texture_size = Size2D::new(texture_size, texture_size);
}
});

This comment has been minimized.

@pcwalton

pcwalton Jun 30, 2016

Collaborator

nit: you could add continue here and then eliminate even more rightward drift by removing the else clause :)

This allows texture allocation to try multiple times, growing or adding texture pages as required.
@glennw glennw force-pushed the glennw:twitter-fix branch from c597fd0 to 21e281e Jun 30, 2016
@glennw
Copy link
Member Author

glennw commented Jun 30, 2016

@bors-servo r=pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Jun 30, 2016

📌 Commit 21e281e has been approved by pcwalton

@metajack
Copy link

metajack commented Jun 30, 2016

Will this fix the box shadow thing on Windows too?

On Wed, Jun 29, 2016 at 6:39 PM, bors-servo notifications@github.com
wrote:

📌 Commit 21e281e
21e281e
has been approved by pcwalton


You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#303 (comment), or mute
the thread
https://github.com/notifications/unsubscribe/AABuxcwkvAEb2pmGoLULYbjBEWSkmPwWks5qQxA-gaJpZM4JBsXM
.

@glennw
Copy link
Member Author

glennw commented Jun 30, 2016

@metajack You mean where it asserts about not getting a standalone alloc? Yes, it should fix that.

@bors-servo
Copy link
Contributor

bors-servo commented Jun 30, 2016

Testing commit 21e281e with merge 0e8ee88...

bors-servo added a commit that referenced this pull request Jun 30, 2016
Fix twitter login crash.

This allows texture allocation to try multiple times, growing or adding texture pages as required.
@Ms2ger Ms2ger merged commit 21e281e into servo:master Jun 30, 2016
2 of 3 checks passed
2 of 3 checks passed
homu Testing commit 21e281e with merge 0e8ee88...
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@glennw glennw deleted the glennw:twitter-fix branch Dec 12, 2016
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

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