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

Support z-index in geckolib #11176

Merged
merged 1 commit into from May 13, 2016
Merged

Support z-index in geckolib #11176

merged 1 commit into from May 13, 2016
+20 −1

Conversation

@mbrubeck
Copy link
Contributor

mbrubeck commented May 13, 2016 •
edited by larsbergstrom

r? @bholley

cc @heycam

This change is Reviewable
@highfive
Copy link

highfive commented May 13, 2016

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
ports/geckolib/properties.mako.rs Outdated
unsafe { *self.gecko.mZIndex.mValue.mInt.as_mut() = 0; }
}
longhands::z_index::computed_value::T::Number(n) => {
self.gecko.mZIndex.mUnit = nsStyleUnit::eStyleUnit_None;

This comment has been minimized.

Sign in to view
@bholley

bholley May 13, 2016

Contributor

Don't we want eStyleUnit_Integer here?
ports/geckolib/properties.mako.rs Outdated
fn set_z_index(&mut self, v: longhands::z_index::computed_value::T) {
use gecko_bindings::structs::nsStyleUnit;
match v {
longhands::z_index::computed_value::T::Auto => {

This comment has been minimized.

Sign in to view
@bholley

bholley May 13, 2016

Contributor

seems like it would be cleaner to |use| this type.
@bholley
Copy link
Contributor

bholley commented May 13, 2016

r=me with those fixes. @heycam should give it a quick lookover, but no need to block landing on that.
@mbrubeck
Support z-index in geckolib
Loading status checks…
b37bb45
@mbrubeck mbrubeck force-pushed the mbrubeck:stylo-zindex branch from a371754 to b37bb45 May 13, 2016
@highfive
Copy link

highfive commented May 13, 2016

New code was committed to pull request.
@mbrubeck
Copy link
Contributor Author

mbrubeck commented May 13, 2016

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

bors-servo commented May 13, 2016

📌 Commit b37bb45 has been approved by bholley
@bors-servo
Copy link
Contributor

bors-servo commented May 13, 2016

⌛ Testing commit b37bb45 with merge 21be9e8...
bors-servo added a commit that referenced this pull request May 13, 2016
@bors-servo
Auto merge of #11176 - mbrubeck:stylo-zindex, r=bholley
Loading status checks…
21be9e8 
Support z-index in geckolib

r? @bholley

cc @heycam

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

bors-servo commented May 13, 2016

💔 Test failed - linux-rel
@highfive
Copy link

highfive commented May 13, 2016 

  ▶ TIMEOUT [expected FAIL] /css21_dev/html4/font-family-rule-001.htm
  │ 
  │ Xlib:  extension &#34;XFree86-VidModeExtension&#34; missing on display &#34;:0&#34;.
  │ Shutting down the Constellation after generating an output file or exit flag specified
  │ thread &#39;Constellation&#39; panicked at &#39;Couldn&#39;t receive FontCacheThread reply: IoError(Error { repr: Os { code: 104, message: &#34;Connection reset by peer&#34; } })&#39;, ../src/libcore/result.rs:785
  │ stack backtrace:
  │    1:     0x7f4f8177b040 - std::sys::backtrace::tracing::imp::write::h9fb600083204ae7f
  │    2:     0x7f4f817827bb - std::panicking::default_hook::_$u7b$$u7b$closure$u7d$$u7d$::hca543c34f11229ac
  │    3:     0x7f4f81782423 - std::panicking::default_hook::hc2c969e7453d080c
  │    4:     0x7f4f80eb4c47 - util::panicking::initiate_panic_hook::_$u7b$$u7b$closure$u7d$$u7d$::_$u7b$$u7b$closure$u7d$$u7d$::h625edf9a36237d31
  │    5:     0x7f4f81768503 - std::sys_common::unwind::begin_unwind_inner::h30e12d15ce2b2e25
  │    6:     0x7f4f81769f48 - std::sys_common::unwind::begin_unwind_fmt::hb2de8a9968d38523
  │    7:     0x7f4f8177a291 - rust_begin_unwind
  │    8:     0x7f4f817b983f - core::panicking::panic_fmt::h257ceb0aa351d801
  │    9:     0x7f4f80a593e3 - core::result::unwrap_failed::h330560dbaf0a51e7
  │   10:     0x7f4f80a7f6ca - gfx::font_cache_thread::FontCacheThread::exit::ha2f1f4fd6ebc6397
  │   11:     0x7f4f7fdf0d68 - _&lt;compositing..Constellation&lt;LTF, STF&gt;&gt;::handle_exit::hae6d0417398a20fa
  │   12:     0x7f4f7fdc6592 - _&lt;compositing..Constellation&lt;LTF, STF&gt;&gt;::handle_request::h3c97e2d5b7782802
  │   13:     0x7f4f7fdba1dc - std::sys_common::unwind::try::try_fn::h12e8cdd1c52fbc04
  │   14:     0x7f4f8177a21b - __rust_try
  │   15:     0x7f4f8177a1ad - std::sys_common::unwind::inner_try::h47a4d9cd4a369dcd
  │   16:     0x7f4f7fdbb7ca - _&lt;F as std..boxed..FnBox&lt;A&gt;&gt;::call_box::h4fbd446f73dda14f
  │   17:     0x7f4f81780c74 - std::sys::thread::Thread::new::thread_start::h6f266e069bf4ec2b
  │   18:     0x7f4f7d738181 - start_thread
  │   19:     0x7f4f7d24f47c - __clone
  └   20:                0x0 - &lt;unknown&gt;
@mbrubeck
Copy link
Contributor Author

mbrubeck commented May 13, 2016

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

bors-servo commented May 13, 2016

⚡ Previous build results for android, arm32, arm64, linux-dev, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows are reusable. Rebuilding only linux-rel...
@bors-servo
Copy link
Contributor

bors-servo commented May 13, 2016

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows
@bors-servo bors-servo merged commit b37bb45 into servo:master May 13, 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
@heycam
Copy link
Member

heycam commented May 14, 2016

LGTM. When we come to implement column-count in geckolib, we might want to factor out the handling of z-index and column-count into a new IntegerOrAutoOrNone type to avoid some duplication in components/style/properties/longhand/ and also so that we can handle this named value type in ports/geckolib/properties.mako.rs (by adding a ToGeckoStyleCoord impl for it).
@mbrubeck mbrubeck deleted the mbrubeck:stylo-zindex branch May 17, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@bholley bholley

Labels
S-tests-failed
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@mbrubeck @highfive @bholley @bors-servo @heycam
You can’t perform that action at this time.