Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-10-18 09:19:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #13957 - mrobinson:scroll_root, r=glennw

Browse source 
Track overflow:scroll stacking contexts with ScrollRootId instead of StackingContextId

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because this PR should not change behavior.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/13957)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-10-30 15:27:56 -05:00 • committed by GitHub
commit 3a3f3192a8
31 changed files with 540 additions and 301 deletions
Download patch file Download diff file Expand all files Collapse all files

44
components/servo/Cargo.lock generated
View file

@ -46,8 +46,8 @@ dependencies = [
"util 0.0.1",
"util_tests 0.0.1",
"webdriver_server 0.0.1",
"webrender 0.7.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.7.0 (git+https://github.com/servo/webrender)",
"webrender 0.8.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.8.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -233,7 +233,7 @@ dependencies = [
"offscreen_gl_context 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1",
"util 0.0.1",
"webrender_traits 0.7.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.8.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -250,7 +250,7 @@ dependencies = [
"plugins 0.0.1",
"serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.7.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.8.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -338,8 +338,8 @@ dependencies = [
"time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"webrender 0.7.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.7.0 (git+https://github.com/servo/webrender)",
"webrender 0.8.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.8.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -370,7 +370,7 @@ dependencies = [
"style_traits 0.0.1",
"url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"webrender_traits 0.7.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.8.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -815,7 +815,7 @@ dependencies = [
"unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"webrender_traits 0.7.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.8.0 (git+https://github.com/servo/webrender)",
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"xi-unicode 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1167,7 +1167,7 @@ dependencies = [
"unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"webrender_traits 0.7.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.8.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1207,7 +1207,7 @@ dependencies = [
"style 0.0.1",
"url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"webrender_traits 0.7.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.8.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1221,7 +1221,7 @@ dependencies = [
"profile_traits 0.0.1",
"script_traits 0.0.1",
"url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.7.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.8.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1390,7 +1390,7 @@ dependencies = [
"plugins 0.0.1",
"serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.7.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.8.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1428,7 +1428,7 @@ dependencies = [
"url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"uuid 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.7.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.8.0 (git+https://github.com/servo/webrender)",
"websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1486,7 +1486,7 @@ dependencies = [
"url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"uuid 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.7.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.8.0 (git+https://github.com/servo/webrender)",
"websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1983,7 +1983,7 @@ dependencies = [
"url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"uuid 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.7.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.8.0 (git+https://github.com/servo/webrender)",
"websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
"xml5ever 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -2659,8 +2659,8 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.7.0"
source = "git+https://github.com/servo/webrender#4440d1daa3d6e9630d4b164f7bae644b9dc4cb8a"
version = "0.8.0"
source = "git+https://github.com/servo/webrender#d44b1ffd3ea9e9e97ef7a70c1ac0f53bbd626850"
dependencies = [
"app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2679,13 +2679,13 @@ dependencies = [
"offscreen_gl_context 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.7.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.8.0 (git+https://github.com/servo/webrender)",
]
[[package]]
name = "webrender_traits"
version = "0.7.0"
source = "git+https://github.com/servo/webrender#4440d1daa3d6e9630d4b164f7bae644b9dc4cb8a"
version = "0.8.0"
source = "git+https://github.com/servo/webrender#d44b1ffd3ea9e9e97ef7a70c1ac0f53bbd626850"
dependencies = [
"app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3001,8 +3001,8 @@ dependencies = [
"checksum wayland-sys 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9633f7fe5de56544215f82eaf1b76bf1b584becf7f08b58cbef4c2c7d10e803a"
"checksum wayland-window 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "309b69d3a863c9c21422d889fb7d98cf02f8a2ca054960a49243ce5b67ad884c"
"checksum webdriver 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee2d66e90672022ced375134329c57be4db228b19b120b97b744a469c381be06"
"checksum webrender 0.7.0 (git+https://github.com/servo/webrender)" = "<none>"
"checksum webrender_traits 0.7.0 (git+https://github.com/servo/webrender)" = "<none>"
"checksum webrender 0.8.0 (git+https://github.com/servo/webrender)" = "<none>"
"checksum webrender_traits 0.8.0 (git+https://github.com/servo/webrender)" = "<none>"
"checksum websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a1a6ea5ed0367f32eb3d94dcc58859ef4294b5f75ba983dbf56ac314af45d"
"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"