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

Implement viewport functions for window #1718 #7500

Merged
merged 1 commit into from Sep 2, 2015

Conversation

@farodin91
Copy link
Contributor

farodin91 commented Sep 1, 2015

@jdm r?
closes #6875

Review on Reviewable

@jdm
Copy link
Member

jdm commented Sep 1, 2015

For future reference, it's perfectly acceptable to squash and then force push the result to the original branch so we don't need a separate PR :)

@jdm
Copy link
Member

jdm commented Sep 1, 2015

@bors-servo: r+
Thanks for sticking through the review process :)

@bors-servo
Copy link
Contributor

bors-servo commented Sep 1, 2015

📌 Commit f50e7de has been approved by jdm

@farodin91
Copy link
Contributor Author

farodin91 commented Sep 1, 2015

How can i reset the original branch to upstream/master?

@jdm
Copy link
Member

jdm commented Sep 1, 2015

git reset --hard remotes/upstream/master will reset the current branch.

@farodin91
Copy link
Contributor Author

farodin91 commented Sep 1, 2015

Thanks

@bors-servo
Copy link
Contributor

bors-servo commented Sep 1, 2015

Testing commit f50e7de with merge 0f0436b...

bors-servo pushed a commit that referenced this pull request Sep 1, 2015
Implement viewport functions for window #1718

@jdm r?
closes #6875

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

bors-servo commented Sep 1, 2015

💔 Test failed - linux-dev

@farodin91 farodin91 force-pushed the farodin91:viewport branch from f50e7de to 41d67de Sep 1, 2015
@jdm
Copy link
Member

jdm commented Sep 1, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Sep 1, 2015

📌 Commit 41d67de has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Sep 1, 2015

Testing commit 41d67de with merge c0a5d66...

bors-servo pushed a commit that referenced this pull request Sep 1, 2015
Implement viewport functions for window #1718

@jdm r?
closes #6875

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

bors-servo commented Sep 1, 2015

💔 Test failed - gonk

@jdm
Copy link
Member

jdm commented Sep 1, 2015

src/window.rs:10:5: 10:23 error: unused import
src/window.rs:10 use euclid::rect::Rect;
                     ^~~~~~~~~~~~~~~~~~
src/main.rs:5:9: 5:23 note: lint level defined here
src/main.rs:5 #![deny(unused_imports)]
                      ^~~~~~~~~~~~~~
src/window.rs:307:30: 307:43 warning: found non-foreign-function-safe member in struct marked #[repr(C)]: found Rust type `isize` in foreign module, while `libc::c_int` or `libc::c_long` should be used, #[warn(improper_ctypes)] on by default
src/window.rs:307     fn gnw_perform(win: *mut ANativeWindow, op: c_int, ...) -> c_int;
                                               ^~~~~~~~~~~~~
src/window.rs:802:30: 802:34 error: unused variable: `size`
src/window.rs:802     fn set_inner_size(&self, size: Size2D<u32>) {
                                               ^~~~
src/main.rs:6:9: 6:25 note: lint level defined here
src/main.rs:6 #![deny(unused_variables)]
                      ^~~~~~~~~~~~~~~~
src/window.rs:806:28: 806:33 error: unused variable: `point`
src/window.rs:806     fn set_position(&self, point: Point2D<i32>) {
                                             ^~~~~
src/main.rs:6:9: 6:25 note: lint level defined here
src/main.rs:6 #![deny(unused_variables)]
                      ^~~~~~~~~~~~~~~~
error: aborting due to 3 previous errors
Could not compile `b2s`.
@farodin91 farodin91 force-pushed the farodin91:viewport branch from 41d67de to f098738 Sep 1, 2015
@highfive highfive removed the S-tests-failed label Sep 1, 2015
@jdm
Copy link
Member

jdm commented Sep 2, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Sep 2, 2015

📌 Commit f098738 has been approved by jdm

@jdm jdm self-assigned this Sep 2, 2015
@bors-servo
Copy link
Contributor

bors-servo commented Sep 2, 2015

Testing commit f098738 with merge a844c0b...

bors-servo pushed a commit that referenced this pull request Sep 2, 2015
Implement viewport functions for window #1718

@jdm r?
closes #6875

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

bors-servo commented Sep 2, 2015

@bors-servo bors-servo merged commit f098738 into servo:master Sep 2, 2015
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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

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