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

WebRender no longer needs StackingLevel information #10678

Merged

Conversation

@mrobinson
Copy link
Member

mrobinson commented Apr 18, 2016

Since the display list is already sorted before it is passed to
WebRender, we don't need to pass the stacking level information any
longer. Update webrender, webrender_traits, and gleam.


This change is Reviewable

@highfive
Copy link

highfive commented Apr 18, 2016

warning Warning warning

  • These commits modify layout code, but no tests are modified. Please consider adding a test!
@mrobinson
Copy link
Member Author

mrobinson commented Apr 18, 2016

@gw or @pcwalton r?

@nox nox assigned pcwalton and unassigned nox Apr 18, 2016
@pcwalton
Copy link
Contributor

pcwalton commented Apr 18, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Apr 18, 2016

📌 Commit 0bf3c81 has been approved by pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Apr 18, 2016

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

Since the display list is already sorted before it is passed to
WebRender, we don't need to pass the stacking level information any
longer. Update webrender, webrender_traits, and gleam.
@mrobinson mrobinson force-pushed the mrobinson:remove-stackinglevel-from-webrender branch from 0bf3c81 to 72e2679 Apr 18, 2016
@mrobinson
Copy link
Member Author

mrobinson commented Apr 18, 2016

I rebased the patch. Going to send to bors again.

@mrobinson
Copy link
Member Author

mrobinson commented Apr 18, 2016

@bors-servo r=pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Apr 18, 2016

📌 Commit 72e2679 has been approved by pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Apr 18, 2016

Testing commit 72e2679 with merge bbe5f37...

bors-servo added a commit that referenced this pull request Apr 18, 2016
… r=pcwalton

WebRender no longer needs StackingLevel information

Since the display list is already sorted before it is passed to
WebRender, we don't need to pass the stacking level information any
longer. Update webrender, webrender_traits, and gleam.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10678)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 19, 2016

💔 Test failed - mac-rel-wpt

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Apr 19, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Apr 19, 2016

Testing commit 72e2679 with merge 19acadd...

bors-servo added a commit that referenced this pull request Apr 19, 2016
… r=pcwalton

WebRender no longer needs StackingLevel information

Since the display list is already sorted before it is passed to
WebRender, we don't need to pass the stacking level information any
longer. Update webrender, webrender_traits, and gleam.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10678)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 19, 2016

💔 Test failed - mac-rel-wpt

@KiChjang
Copy link
Member

KiChjang commented Apr 19, 2016

Ran 4677 tests finished in 1429.0 seconds.
  • 4675 ran as expected. 1023 tests skipped.
  • 1 tests crashed unexpectedly
  • 1 tests unexpectedly okay
  • 1 tests had unexpected subtest results

Tests with unexpected results:
  ▶ OK [expected CRASH] /webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-S_V.html

  ▶ Unexpected subtest result in /webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-S_V.html:
  │ FAIL [expected PASS] WebGL test #0: testValidArgs
  │   → assert_true: testValidArgs expected true got false
  │ 
  │ reportTestResultsToHarness/<@http://web-platform.test:8000/webgl/conformance-1.0.3/conformance/more/unit.js:900:7
  │ Test.prototype.step@http://web-platform.test:8000/resources/testharness.js:1381:20
  │ test@http://web-platform.test:8000/resources/testharness.js:495:9
  │ reportTestResultsToHarness@http://web-platform.test:8000/webgl/conformance-1.0.3/conformance/more/unit.js:899:1
  │ runTests@http://web-platform.test:8000/webgl/conformance-1.0.3/conformance/more/unit.js:188:5
  │ initTests@http://web-platform.test:8000/webgl/conformance-1.0.3/conformance/more/unit.js:922:5
  └ @http://web-platform.test:8000/webgl/conformance-1.0.3/conformance/more/unit.js:947:7

  ▶ CRASH [expected OK] /webgl/conformance-1.0.3/conformance/textures/gl-teximage.html
  │ 
  │ DESCRIPTION: Test texImage2D conversions.
  │ PASS getError was expected value: NO_ERROR : Should be no errors from setup.
  │ thread 'PaintWorker' panicked at 'assertion failed: (data.len() as i32) >= stride * size.height', /Users/servo/.cargo/git/checkouts/rust-azure-97bcec2370a94878/master/src/azure_hl.rs:710
  │ stack backtrace:
  │    1:        0x10cab61b8 - std::sys::backtrace::tracing::imp::write::h714760a4c8c0cdd8
  │    2:        0x10cabc495 - std::panicking::default_hook::_$u7b$$u7b$closure$u7d$$u7d$::hff309ab1d83ffd90
  │    3:        0x10cabc0ae - std::panicking::default_hook::h08ad3bb09872855b
  │    4:        0x10c12cfdf - util::panicking::initiate_panic_hook::_ALERT: RESULT: ["/webgl/conformance-1.0.3/conformance/textures/gl-teximage.html",0,null,null,[["WebGL test #0: getError was expected value: NO_ERROR : Should be no errors from setup.",0,null,null]]]
  │ $u7b$$u7b$closure$u7d$$u7d$::_$u7b$$u7b$closure$u7d$$u7d$::h0bad41b0b38a855d
  │    5:        0x10caa3e88 - std::sys_common::unwind::begin_unwind_inner::h406d5f1a330b854b
  │ loadImagesAsync: loaded ../resources/gray-ramp-256.png
  │    6:        0x10bc41d14 - std::sys_common::unwind::begin_unwind::h51df842978a11a26
  │ loadImagesAsync: loaded ../resources/gray-ramp-default-gamma.png
  │ loadImagesAsync: loaded ../resources/1-channel.jpg
  │ loadImagesAsync: loaded ../resources/gray-ramp-256-with-128-alpha.png
  │ loadImagesAsync: loaded ../resources/gray-ramp-gamma0.1.png
  │    7:        0x10c75ddc2 - azure::azure_hl::DrawTarget::create_source_surface_from_data::h02197b069d714704
  │ loadImagesAsync: loaded ../resources/gray-ramp-gamma1.0.png
  │    8:        0x10bcfd365 - gfx::paint_context::PaintContext::draw_image::h9675260d26bab1f8
  │ loadImagesAsync: loaded ../resources/gray-ramp-gamma9.0.png
  │    9:        0x10bd0f6a2 - gfx::display_list::DisplayItem::draw_into_context::h4ecad61f8b46d0f9
  │ loadImagesAsync: loaded ../resources/gray-ramp-gamma2.0.png
  │   10:        0x10bd0f504 - gfx::display_list::DisplayList::draw_item_at_index_into_context::hc93236a310972441
  │ loadImagesAsync: loaded ../resources/gray-ramp.png
  │   11:        0x10bd2735b - gfx::paint_thread::WorkerThread::main::h768ba2c99b634f72
  │ loadImagesAsync: loaded ../resources/gray-ramp-gamma4.0.png
  │   12:        0x10bd2507b - std::sys_common::unwind::try::try_fn::hb697826281a0992b
  │   13:        0x10cab541b - __rust_try
  │   14:        0x10cab53a3 - std::sys_common::unwind::inner_try::h4e97625a08807651
  │ loadImagesAsync: loaded ../resources/zero-alpha.png
  │   15:        0x10bd257ff - _<F as alloc..boxed..FnBox<A>>::call_box::hf01593981b31feb0
  │   16:        0x10cabb518 - std::sys::thread::Thread::new::thread_start::h74af400293164137
  │   17:     0x7fff86bcf059 - _pthread_body
  │   18:     0x7fff86bcefd6 - _pthread_start
  │ Thread "PaintThread PipelineId { namespace_id: PipelineNamespaceId(0), index: PipelineIndex(0) }" panicked with an unwrap of `RecvError` (backtrace skipped)
  └ Pipeline failed in hard-fail mode.  Crashing!

These look like new intermittents...

@jdm
Copy link
Member

jdm commented Apr 19, 2016

They are, but they're not caused by this PR. The webgl tests are unstable.

@KiChjang
Copy link
Member

KiChjang commented Apr 19, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Apr 19, 2016

Testing commit 72e2679 with merge 062d933...

bors-servo added a commit that referenced this pull request Apr 19, 2016
… r=pcwalton

WebRender no longer needs StackingLevel information

Since the display list is already sorted before it is passed to
WebRender, we don't need to pass the stacking level information any
longer. Update webrender, webrender_traits, and gleam.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10678)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 19, 2016

@bors-servo bors-servo merged commit 72e2679 into servo:master Apr 19, 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
@mrobinson mrobinson deleted the mrobinson:remove-stackinglevel-from-webrender branch Nov 16, 2016
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

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