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

Fix to issue 9338 #9341

Merged
merged 1 commit into from Jan 18, 2016
Merged

Fix to issue 9338 #9341

merged 1 commit into from Jan 18, 2016
+2 −10

Conversation

@njskalski
Copy link
Contributor

njskalski commented Jan 16, 2016

Fixes #9338.

Review on Reviewable
@highfive
Copy link

highfive commented Jan 16, 2016

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @mbrubeck (or someone else) soon.
@highfive
Copy link

highfive commented Jan 16, 2016

warning Warning warning

  • These commits modify layout code, but no tests are modified. Please consider adding a test!
@njskalski
Copy link
Contributor Author

njskalski commented Jan 16, 2016

maybe I should have left it to somebody else
@KiChjang
Copy link
Member

KiChjang commented Jan 16, 2016

@askalski Please try not to work on issues without claiming them first on GitHub. We had cases where two or more people were working on the same issue, and we had to throw away one or more people's work.
components/layout/display_list_builder.rs Outdated
@@ -1983,4 +1975,3 @@ pub enum StackingContextCreationMode {
OuterScrollWrapper,
InnerScrollWrapper,
}

This comment has been minimized.

Sign in to view
@KiChjang

KiChjang Jan 16, 2016

Member

Revert this please.
@nox
Copy link
Member

nox commented Jan 16, 2016

It would be nice to write proper commit messages btw. One day, GitHub will disappear and we won't know what's issue 9338.
@njskalski
replacing custom fmin function with standard f32.min in components/la…
Loading status checks…
cf107bc 
…yout/display_list_builder.rs
@njskalski
Copy link
Contributor Author

njskalski commented Jan 18, 2016

KiChjang , nox: you are right. I apologize and focus on my task instead.
@KiChjang
Copy link
Member

KiChjang commented Jan 18, 2016

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

bors-servo commented Jan 18, 2016

📌 Commit cf107bc has been approved by KiChjang
@bors-servo
Copy link
Contributor

bors-servo commented Jan 18, 2016

⌛ Testing commit cf107bc with merge 7e7e985...
bors-servo added a commit that referenced this pull request Jan 18, 2016
@bors-servo
Auto merge of #9341 - askalski:issue9338, r=KiChjang
7e7e985 
Fix to issue 9338

Fixes #9338.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9341)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jan 18, 2016

💔 Test failed - linux-rel
@KiChjang
Copy link
Member

KiChjang commented Jan 18, 2016

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

bors-servo commented Jan 18, 2016

⌛ Testing commit cf107bc with merge 8f7f7e1...
bors-servo added a commit that referenced this pull request Jan 18, 2016
@bors-servo
Auto merge of #9341 - askalski:issue9338, r=KiChjang
Loading status checks…
8f7f7e1 
Fix to issue 9338

Fixes #9338.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9341)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jan 18, 2016

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit cf107bc into servo:master Jan 18, 2016
2 checks passed
2 checks passed
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

@KiChjang KiChjang

Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@njskalski @highfive @KiChjang @nox @bors-servo
You can’t perform that action at this time.