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

Fix bleeding in FxR by adding Padding support to ServoSurface #23002

Merged
merged 1 commit into from Mar 26, 2019

Conversation

@paulrouget
Copy link
Contributor

paulrouget commented Mar 8, 2019

Not ready for review, just need to make sure the CI is happy for now.


This change is Reviewable

@highfive
Copy link

highfive commented Mar 8, 2019

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/Cargo.toml, components/webdriver_server/Cargo.toml
  • @jgraham: components/webdriver_server/Cargo.toml
  • @KiChjang: components/script/Cargo.toml, components/net_traits/Cargo.toml
  • @emilio: components/layout/display_list/webrender_helpers.rs, components/layout/display_list/builder.rs
@highfive
Copy link

highfive commented Mar 8, 2019

warning Warning warning

  • These commits modify gfx, layout, and script code, but no tests are modified. Please consider adding a test!
@paulrouget paulrouget force-pushed the paulrouget:padding branch 2 times, most recently from 54f4e3e to 8dcd09e Mar 11, 2019
@paulrouget
Copy link
Contributor Author

paulrouget commented Mar 13, 2019

@gw3583 can you look at the last commit of this PR, only the compositor.rs change, and tell me if that makes sense? I want anything that outside of a WR document to be transparent. It works here.

@gw3583
Copy link
Contributor

gw3583 commented Mar 13, 2019

@paulrouget Yep, that seems reasonable to me.

@paulrouget paulrouget force-pushed the paulrouget:padding branch from 8dcd09e to 3f839bd Mar 14, 2019
@paulrouget
Copy link
Contributor Author

paulrouget commented Mar 14, 2019

r? @jdm (only last commit)

@highfive highfive assigned jdm and unassigned emilio Mar 14, 2019
@paulrouget paulrouget force-pushed the paulrouget:padding branch from 3f839bd to 5296fb1 Mar 14, 2019
@jdm
Copy link
Member

jdm commented Mar 14, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Mar 14, 2019

📌 Commit 5296fb1 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Mar 14, 2019

Testing commit 5296fb1 with merge c58718a...

bors-servo added a commit that referenced this pull request Mar 14, 2019
Fix bleeding in FxR by adding Padding support to ServoSurface

Not ready for review, just need to make sure the CI is happy for now.

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

bors-servo commented Mar 14, 2019

💔 Test failed - magicleap

@CYBAI
Copy link
Collaborator

CYBAI commented Mar 15, 2019

Error in magicleap:

error[E0560]: struct `simpleservo::InitOptions` has no field named `width`
   --> ports/libmlservo/src/lib.rs:120:9
    |
120 |         width: width,
    |         ^^^^^ `simpleservo::InitOptions` does not have this field
    |
    = note: available fields are: `args`, `url`, `coordinates`, `density`, `vr_pointer`, `enable_subpixel_text_antialiasing`

error[E0560]: struct `simpleservo::InitOptions` has no field named `height`
   --> ports/libmlservo/src/lib.rs:121:9
    |
121 |         height: height,
    |         ^^^^^^ `simpleservo::InitOptions` does not have this field
    |
    = note: available fields are: `args`, `url`, `coordinates`, `density`, `vr_pointer`, `enable_subpixel_text_antialiasing`

I'm not sure if there's any related filtered WPT tests so let me paste all of them here 👀

Filtered WPT in mac-rel-css1:

{
    "status": "PASS", 
    "group": "default", 
    "message": null, 
    "stack": null, 
    "subtest": null, 
    "test": "/html/rendering/non-replaced-elements/tables/colgroup_valign_bottom.xhtml", 
    "line": 10062, 
    "action": "test_result", 
    "expected": "FAIL"
}
{
    "status": "PASS", 
    "group": "default", 
    "message": null, 
    "stack": null, 
    "subtest": null, 
    "test": "/html/rendering/non-replaced-elements/tables/colgroup_valign_top.xhtml", 
    "line": 10123, 
    "action": "test_result", 
    "expected": "FAIL"
}
{
    "status": "FAIL", 
    "group": "default", 
    "message": "/css/compositing/compositing_simple_div.html f73ffe6a9f3cc5e17430d6ef44420ba47319b0f1\n/css/compositing/compositing_simple_div-ref.html 1f3a75c2c13cafe10d6b98241fc2b1efd9d1d219", 
    "stack": null, 
    "subtest": null, 
    "test": "/css/compositing/compositing_simple_div.html", 
    "line": 20028, 
    "action": "test_result", 
    "expected": "PASS"
}
{
    "status": "FAIL", 
    "group": "default", 
    "message": "/_mozilla/css/border_radius_zero_sizes_a.html a7f6c6aac49f5837594e098d7da466a13b352df8\n/_mozilla/css/border_radius_zero_sizes_ref.html c0989af36f011e8805f21a8e517b1c4d9cce9df3", 
    "stack": null, 
    "subtest": null, 
    "test": "/_mozilla/css/border_radius_zero_sizes_a.html", 
    "line": 23402, 
    "action": "test_result", 
    "expected": "PASS"
}

Filtered WPT in linux-rel-wpt:

{
    "status": "FAIL", 
    "group": "default", 
    "message": "/css/css-backgrounds/background-color-body-propagation-004.html bb144e9256051f1d3d82a0b5b6a548af5a15b917\n/css/reference/blank.html 54a9df64f1476dd12020019d7cf22ac34d727bc0", 
    "stack": null, 
    "subtest": null, 
    "test": "/css/css-backgrounds/background-color-body-propagation-004.html", 
    "line": 26093, 
    "action": "test_result", 
    "expected": "PASS"
}
{
    "status": "FAIL", 
    "group": "default", 
    "message": "/css/compositing/compositing_simple_div.html f73ffe6a9f3cc5e17430d6ef44420ba47319b0f1\n/css/compositing/compositing_simple_div-ref.html 1f3a75c2c13cafe10d6b98241fc2b1efd9d1d219", 
    "stack": null, 
    "subtest": null, 
    "test": "/css/compositing/compositing_simple_div.html", 
    "line": 26535, 
    "action": "test_result", 
    "expected": "PASS"
}
{
    "status": "FAIL", 
    "group": "default", 
    "message": "/css/css-transforms/perspective-translateZ-negative.html 0cdf9ee5d3f11a7b603fcb0ba2de2287a90163e9\n/css/css-transforms/reference/perspective-reftest.html a02e9400d3d7808968ca282320a1123ef2a6feb9", 
    "stack": null, 
    "subtest": null, 
    "test": "/css/css-transforms/perspective-translateZ-negative.html", 
    "line": 33568, 
    "action": "test_result", 
    "expected": "PASS"
}
{
    "status": "PASS", 
    "group": "default", 
    "message": null, 
    "stack": null, 
    "subtest": null, 
    "test": "/css/css-transforms/transform3d-perspective-004.html", 
    "line": 36581, 
    "action": "test_result", 
    "expected": "FAIL"
}
{
    "status": "FAIL", 
    "group": "default", 
    "message": "/css/css-transforms/transform3d-rotatex-perspective-002.html 0e3759dd811779763b82fb5ba11ea2b06d379133\n/css/css-transforms/transform3d-rotatex-ref.html 0e3759dd811779763b82fb5ba11ea2b06d379133", 
    "stack": null, 
    "subtest": null, 
    "test": "/css/css-transforms/transform3d-rotatex-perspective-002.html", 
    "line": 36704, 
    "action": "test_result", 
    "expected": "PASS"
}
{
    "status": "PASS", 
    "group": "default", 
    "message": null, 
    "stack": null, 
    "subtest": null, 
    "test": "/css/css-transforms/transform3d-perspective-003.html", 
    "line": 36714, 
    "action": "test_result", 
    "expected": "FAIL"
}
{
    "status": "FAIL", 
    "group": "default", 
    "message": "/css/css-transforms/transform3d-perspective-origin-001.html 0e3759dd811779763b82fb5ba11ea2b06d379133\n/css/css-transforms/transform3d-perspective-origin-ref.html 0e3759dd811779763b82fb5ba11ea2b06d379133\n/css/css-transforms/transform3d-perspective-origin-ref.html 0e3759dd811779763b82fb5ba11ea2b06d379133\n/css/css-transforms/transform3d-rotatex-ref.html 0e3759dd811779763b82fb5ba11ea2b06d379133", 
    "stack": null, 
    "subtest": null, 
    "test": "/css/css-transforms/transform3d-perspective-origin-001.html", 
    "line": 39454, 
    "action": "test_result", 
    "expected": "PASS"
}
{
    "status": "FAIL", 
    "group": "default", 
    "message": "/css/css-transforms/text-perspective-001.html 54a9df64f1476dd12020019d7cf22ac34d727bc0\nabout:blank 54a9df64f1476dd12020019d7cf22ac34d727bc0", 
    "stack": null, 
    "subtest": null, 
    "test": "/css/css-transforms/text-perspective-001.html", 
    "line": 40000, 
    "action": "test_result", 
    "expected": "PASS"
}
{
    "status": "PASS", 
    "group": "default", 
    "message": null, 
    "stack": null, 
    "subtest": null, 
    "test": "/html/rendering/non-replaced-elements/tables/colgroup_valign_bottom.xhtml", 
    "line": 40515, 
    "action": "test_result", 
    "expected": "FAIL"
}
{
    "status": "PASS", 
    "group": "default", 
    "message": null, 
    "stack": null, 
    "subtest": null, 
    "test": "/html/rendering/non-replaced-elements/tables/colgroup_valign_top.xhtml", 
    "line": 40628, 
    "action": "test_result", 
    "expected": "FAIL"
}
{
    "status": "FAIL", 
    "group": "default", 
    "message": "/_mozilla/css/border_radius_zero_sizes_a.html a7f6c6aac49f5837594e098d7da466a13b352df8\n/_mozilla/css/border_radius_zero_sizes_ref.html c0989af36f011e8805f21a8e517b1c4d9cce9df3", 
    "stack": null, 
    "subtest": null, 
    "test": "/_mozilla/css/border_radius_zero_sizes_a.html", 
    "line": 46240, 
    "action": "test_result", 
    "expected": "PASS"
}
@paulrouget paulrouget mentioned this pull request Mar 18, 2019
@bors-servo
Copy link
Contributor

bors-servo commented Mar 20, 2019

The latest upstream changes (presumably #23058) made this pull request unmergeable. Please resolve the merge conflicts.

@paulrouget paulrouget force-pushed the paulrouget:padding branch from 5296fb1 to de31110 Mar 25, 2019
@paulrouget paulrouget force-pushed the paulrouget:padding branch from de31110 to 224cab4 Mar 25, 2019
@paulrouget paulrouget force-pushed the paulrouget:padding branch from fdd94e1 to 8f2390f Mar 25, 2019
@paulrouget
Copy link
Contributor Author

paulrouget commented Mar 25, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Mar 25, 2019

Trying commit 8f2390f with merge 0555bc4...

bors-servo added a commit that referenced this pull request Mar 25, 2019
Fix bleeding in FxR by adding Padding support to ServoSurface

Not ready for review, just need to make sure the CI is happy for now.

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

bors-servo commented Mar 25, 2019

💔 Test failed - status-taskcluster

@paulrouget
Copy link
Contributor Author

paulrouget commented Mar 26, 2019

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Mar 26, 2019

Trying commit 8f2390f with merge d0513a4...

bors-servo added a commit that referenced this pull request Mar 26, 2019
Fix bleeding in FxR by adding Padding support to ServoSurface

Not ready for review, just need to make sure the CI is happy for now.

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

bors-servo commented Mar 26, 2019

💔 Test failed - linux-rel-css

@paulrouget
Copy link
Contributor Author

paulrouget commented Mar 26, 2019

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Mar 26, 2019

Trying commit 8f2390f with merge ccbb3ac...

bors-servo added a commit that referenced this pull request Mar 26, 2019
Fix bleeding in FxR by adding Padding support to ServoSurface

Not ready for review, just need to make sure the CI is happy for now.

<!-- 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/23002)
<!-- Reviewable:end -->
@paulrouget
Copy link
Contributor Author

paulrouget commented Mar 26, 2019

From IRC:

gw: yes, what you have there looks fine to do - it's probably a good idea to disable scissor before calling wr.render, though I don't think it's actually necessary right now

@paulrouget
Copy link
Contributor Author

paulrouget commented Mar 26, 2019

(I'll be on PTO for a week, if this turns green, can someone r=jdm this PR?)

@bors-servo
Copy link
Contributor

bors-servo commented Mar 26, 2019

@CYBAI
Copy link
Collaborator

CYBAI commented Mar 26, 2019

It's green! but sorry that I can only help to try 😂

@jdm
Copy link
Member

jdm commented Mar 26, 2019

@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Mar 26, 2019

📌 Commit 8f2390f has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Mar 26, 2019

Testing commit 8f2390f with merge cd374f0...

bors-servo added a commit that referenced this pull request Mar 26, 2019
Fix bleeding in FxR by adding Padding support to ServoSurface

Not ready for review, just need to make sure the CI is happy for now.

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

bors-servo commented Mar 26, 2019

@bors-servo bors-servo merged commit 8f2390f into servo:master Mar 26, 2019
4 checks passed
4 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
Travis CI - Pull Request Build Passed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
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.

None yet

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