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

Basic pinch zoom handling #20749

Merged
merged 1 commit into from May 25, 2018
Merged

Basic pinch zoom handling #20749

merged 1 commit into from May 25, 2018

Conversation

@mbrubeck
Copy link
Contributor

mbrubeck commented May 4, 2018 •
edited by SimonSapin

r? glennw

Basic fix for #20387 and #20109. Note: Without calling generate_frame
when updating Webrender's pinch zoom level, rendering doesn't happen
reliably during/after a pinch zoom gesture. I'm not sure whether this
is the correct way to fix that or not.

This change is Reviewable
@highfive
Copy link

highfive commented May 4, 2018

Heads up! This PR modifies the following files:
@gw3583
Copy link
Contributor

gw3583 commented May 14, 2018

We could change the comment to say that we should update Servo to not rely on the generate frame when scrolling code, then r=me.
@mbrubeck mbrubeck force-pushed the mbrubeck:pinch branch from 69f18ad to 1f5ae1a May 14, 2018
@mbrubeck
Copy link
Contributor Author

mbrubeck commented May 14, 2018

Updated.

(Along with the FIXME comment, there's also some refactoring we want to do to move some of this logic to the embedder side, but this patch should be enough for testing graphics and layout functionality.)
@jdm
Copy link
Member

jdm commented May 17, 2018

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

bors-servo commented May 17, 2018

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

bors-servo commented May 17, 2018

☔ The latest upstream changes (presumably #20766) made this pull request unmergeable. Please resolve the merge conflicts.
@bors-servo
Copy link
Contributor

bors-servo commented May 18, 2018

🔒 Merge conflict
@jdm jdm added this to In progress in Android MVP May 22, 2018
@jdm
Copy link
Member

jdm commented May 22, 2018

This can be merged once it's rebased.
@bors-servo
Copy link
Contributor

bors-servo commented May 24, 2018

🔒 Merge conflict
@mbrubeck
Basic pinch zoom handling
Loading status checks…
baf7dbf
@mbrubeck mbrubeck force-pushed the mbrubeck:pinch branch from 1f5ae1a to baf7dbf May 24, 2018
@mbrubeck
Copy link
Contributor Author

mbrubeck commented May 24, 2018

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

bors-servo commented May 24, 2018

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

bors-servo commented May 24, 2018

⌛ Testing commit baf7dbf with merge 1845e94...
bors-servo added a commit that referenced this pull request May 24, 2018
@bors-servo
Auto merge of #20749 - mbrubeck:pinch, r=glennw
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
1845e94 
Basic pinch zoom handling

r? glennw

Basic fix for #20387 and #20109.  Note: Without calling `generate_frame`
when updating Webrender's pinch zoom level, rendering doesn't happen
reliably during/after a pinch zoom gesture.  I'm not sure whether this
is the correct way to fix that or not.

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

bors-servo commented May 24, 2018

💔 Test failed - linux-rel-css
@jdm
Copy link
Member

jdm commented May 24, 2018

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

bors-servo commented May 24, 2018

⌛ Testing commit baf7dbf with merge 6ad085b...
bors-servo added a commit that referenced this pull request May 24, 2018
@bors-servo
Auto merge of #20749 - mbrubeck:pinch, r=glennw
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
6ad085b 
Basic pinch zoom handling

r? glennw

Basic fix for #20387 and #20109.  Note: Without calling `generate_frame`
when updating Webrender's pinch zoom level, rendering doesn't happen
reliably during/after a pinch zoom gesture.  I'm not sure whether this
is the correct way to fix that or not.

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

bors-servo commented May 25, 2018

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: glennw
Pushing 6ad085b to master...
@bors-servo bors-servo merged commit baf7dbf into servo:master May 25, 2018
3 of 4 checks passed
3 of 4 checks passed
Taskcluster (pull_request) TaskGroup: Exception
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Android MVP automation moved this from In progress to Done May 25, 2018
This was referenced Jul 23, 2018
Closed
Closed
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
None yet
Projects
Android MVP
  
Done
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@mbrubeck @highfive @gw3583 @jdm @bors-servo @glennw
You can’t perform that action at this time.