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

Implement support for overscrolling on the Mac. #9851

Merged
merged 1 commit into from Mar 14, 2016
Merged

Implement support for overscrolling on the Mac. #9851

merged 1 commit into from Mar 14, 2016

Conversation

@pcwalton
Copy link
Contributor

pcwalton commented Mar 3, 2016

Requires rust-windowing/glutin#734, servo/webrender_traits#14, and
servo/webrender#217.

r? whoever (waiting on the landing of the above)

Review on Reviewable
@nox nox removed their assignment Mar 3, 2016
@glennw
Copy link
Member

glennw commented Mar 7, 2016

@pcwalton This looks good to me, and I believe the deps have landed now. So a cargo.lock update and this should be good to go.
@pcwalton pcwalton force-pushed the pcwalton:overscroll branch from 5e49095 to 6ddfaa4 Mar 10, 2016
@pcwalton
Copy link
Contributor Author

pcwalton commented Mar 10, 2016

@bors-servo: r=glennw
@bors-servo
Copy link
Contributor

bors-servo commented Mar 10, 2016

📌 Commit 6ddfaa4 has been approved by glennw
@bors-servo
Copy link
Contributor

bors-servo commented Mar 10, 2016

⌛ Testing commit 6ddfaa4 with merge 3bb0470...
bors-servo added a commit that referenced this pull request Mar 10, 2016
@bors-servo
Auto merge of #9851 - pcwalton:overscroll, r=glennw
Loading status checks…
3bb0470 
Implement support for overscrolling on the Mac.

Requires rust-windowing/glutin#734, servo/webrender_traits#14, and
servo/webrender#217.

r? whoever (waiting on the landing of the above)

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

bors-servo commented Mar 10, 2016

💔 Test failed - gonk
@jdm
Copy link
Member

jdm commented Mar 10, 2016

This appears to be missing a gleam update.
@pcwalton
Copy link
Contributor Author

pcwalton commented Mar 10, 2016

@bors-servo: r=glennw
@bors-servo
Copy link
Contributor

bors-servo commented Mar 10, 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: #9781
@bors-servo
Copy link
Contributor

bors-servo commented Mar 10, 2016

📌 Commit 6ddfaa4 has been approved by glennw
@jdm
Copy link
Member

jdm commented Mar 10, 2016

@pcwalton Nothing appears to have changed since the last push?
@pcwalton
Copy link
Contributor Author

pcwalton commented Mar 10, 2016

It's not missing a gleam update, rather it's that WR doesn't build with GLES2. Annoying. I'll fix it.
@pcwalton
Copy link
Contributor Author

pcwalton commented Mar 10, 2016

Now blocked on servo/webrender#232.
@pcwalton pcwalton force-pushed the pcwalton:overscroll branch from 6ddfaa4 to 11c83f2 Mar 10, 2016
@pcwalton
Copy link
Contributor Author

pcwalton commented Mar 10, 2016

@bors-servo: r=glennw
@nox nox removed the S-tests-failed label Mar 12, 2016
@paulrouget paulrouget mentioned this pull request Mar 14, 2016
Open
@paulrouget
Copy link
Contributor

paulrouget commented Mar 14, 2016

Fix #7671
@pcwalton pcwalton force-pushed the pcwalton:overscroll branch from e2240c9 to 8663324 Mar 14, 2016
@pcwalton
Copy link
Contributor Author

pcwalton commented Mar 14, 2016

@bors-servo: r=glennw
@bors-servo
Copy link
Contributor

bors-servo commented Mar 14, 2016

📌 Commit 8663324 has been approved by glennw
@bors-servo
Copy link
Contributor

bors-servo commented Mar 14, 2016

⌛ Testing commit 8663324 with merge 5c8818d...
bors-servo added a commit that referenced this pull request Mar 14, 2016
@bors-servo
Auto merge of #9851 - pcwalton:overscroll, r=glennw
Loading status checks…
5c8818d 
Implement support for overscrolling on the Mac.

Requires rust-windowing/glutin#734, servo/webrender_traits#14, and
servo/webrender#217.

r? whoever (waiting on the landing of the above)

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

bors-servo commented Mar 14, 2016

💔 Test failed - mac-dev-unit
@jdm
Copy link
Member

jdm commented Mar 14, 2016

From ./mach build-cef:

   Compiling embedding v0.0.1 (file:///Users/servo/buildbot/slave/mac-dev-unit/build/ports/cef)
browser_host.rs:472:47: 472:81 error: this function takes 3 parameters but 2 parameters were supplied [E0061]
browser_host.rs:472             this.downcast().send_window_event(WindowEvent::Scroll(delta, origin))
                                                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
browser_host.rs:361:1: 501:2 note: in this expansion of full_cef_class_impl! (defined in macros.rs)
browser_host.rs:472:47: 472:81 help: run `rustc --explain E0061` to see a detailed explanation
error: aborting due to previous error
Could not compile `embedding`.
@pcwalton pcwalton force-pushed the pcwalton:overscroll branch from 8663324 to 8eb2cda Mar 14, 2016
@pcwalton
Copy link
Contributor Author

pcwalton commented Mar 14, 2016

@bors-servo: r=glennw
@bors-servo
Copy link
Contributor

bors-servo commented Mar 14, 2016

📌 Commit 8eb2cda has been approved by glennw
@pcwalton
Implement support for overscrolling on the Mac.
Loading status checks…
8eb2cda 
Requires rust-windowing/glutin#734, servo/webrender_traits#14, and
servo/webrender#217.
@bors-servo
Copy link
Contributor

bors-servo commented Mar 14, 2016

⌛ Testing commit 8eb2cda with merge 881d6b4...
bors-servo added a commit that referenced this pull request Mar 14, 2016
@bors-servo
Auto merge of #9851 - pcwalton:overscroll, r=glennw
Loading status checks…
881d6b4 
Implement support for overscrolling on the Mac.

Requires rust-windowing/glutin#734, servo/webrender_traits#14, and
servo/webrender#217.

r? whoever (waiting on the landing of the above)

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

bors-servo commented Mar 14, 2016

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, status-appveyor
@bors-servo bors-servo merged commit 8eb2cda into servo:master Mar 14, 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

@glennw glennw

Labels
C-assigned P-mac S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@pcwalton @glennw @bors-servo @jdm @nox @paulrouget @highfive
You can’t perform that action at this time.