Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #19313 - heycam:layer-filling, r=CJKu

Browse source 
style: Update layer filling function call in Gecko glue.

This is the (small) Servo part of https://bugzilla.mozilla.org/show_bug.cgi?id=1418899, reviewed there by CJKu.

<!-- 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/19313)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-11-21 00:19:00 -06:00 • committed by GitHub
commit bdb2cacad9
4 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/style/gecko/generated/atom_macro.rs
View file

@ -4058,8 +4058,6 @@ cfg_if! {
pub static nsGkAtoms_ondevicelight: *mut nsStaticAtom;
#[link_name = "_ZN9nsGkAtoms14ondevicechangeE"]
pub static nsGkAtoms_ondevicechange: *mut nsStaticAtom;
#[link_name = "_ZN9nsGkAtoms33mozinputrangeignorepreventdefaultE"]
pub static nsGkAtoms_mozinputrangeignorepreventdefault: *mut nsStaticAtom;
#[link_name = "_ZN9nsGkAtoms13moz_extensionE"]
pub static nsGkAtoms_moz_extension: *mut nsStaticAtom;
#[link_name = "_ZN9nsGkAtoms18all_urlsPermissionE"]
@ -9237,8 +9235,6 @@ cfg_if! {
pub static nsGkAtoms_ondevicelight: *mut nsStaticAtom;
#[link_name = "?ondevicechange@nsGkAtoms@@2PEAVnsStaticAtom@@EA"]
pub static nsGkAtoms_ondevicechange: *mut nsStaticAtom;
#[link_name = "?mozinputrangeignorepreventdefault@nsGkAtoms@@2PEAVnsStaticAtom@@EA"]
pub static nsGkAtoms_mozinputrangeignorepreventdefault: *mut nsStaticAtom;
#[link_name = "?moz_extension@nsGkAtoms@@2PEAVnsStaticAtom@@EA"]
pub static nsGkAtoms_moz_extension: *mut nsStaticAtom;
#[link_name = "?all_urlsPermission@nsGkAtoms@@2PEAVnsStaticAtom@@EA"]
@ -14416,8 +14412,6 @@ cfg_if! {
pub static nsGkAtoms_ondevicelight: *mut nsStaticAtom;
#[link_name = "\x01?ondevicechange@nsGkAtoms@@2PAVnsStaticAtom@@A"]
pub static nsGkAtoms_ondevicechange: *mut nsStaticAtom;
#[link_name = "\x01?mozinputrangeignorepreventdefault@nsGkAtoms@@2PAVnsStaticAtom@@A"]
pub static nsGkAtoms_mozinputrangeignorepreventdefault: *mut nsStaticAtom;
#[link_name = "\x01?moz_extension@nsGkAtoms@@2PAVnsStaticAtom@@A"]
pub static nsGkAtoms_moz_extension: *mut nsStaticAtom;
#[link_name = "\x01?all_urlsPermission@nsGkAtoms@@2PAVnsStaticAtom@@A"]
@ -19598,8 +19592,6 @@ macro_rules! atom {
{{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_ondevicelight as *mut _) } }};
("ondevicechange") =>
{{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_ondevicechange as *mut _) } }};
("mozinputrangeignorepreventdefault") =>
{{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_mozinputrangeignorepreventdefault as *mut _) } }};
("moz-extension") =>
{{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_moz_extension as *mut _) } }};
("<all_urls>") =>

4
components/style/gecko/generated/bindings.rs
View file

@ -850,9 +850,7 @@ extern "C" {
} extern "C" {
pub fn Gecko_ReleaseURLExtraDataArbitraryThread ( aPtr : * mut RawGeckoURLExtraData , ) ;
} extern "C" {
pub fn Gecko_FillAllBackgroundLists ( layers : * mut nsStyleImageLayers , max_len : u32 , ) ;
} extern "C" {
pub fn Gecko_FillAllMaskLists ( layers : * mut nsStyleImageLayers , max_len : u32 , ) ;
pub fn Gecko_FillAllImageLayers ( layers : * mut nsStyleImageLayers , max_len : u32 , ) ;
} extern "C" {
pub fn Gecko_AddRefCalcArbitraryThread ( aPtr : * mut nsStyleCoord_Calc , ) ;
} extern "C" {

33
components/style/gecko/generated/structs.rs
View file

File diff suppressed because one or more lines are too long

4
components/style/properties/gecko.mako.rs
View file

@ -4072,7 +4072,7 @@ fn static_assert() {
fill_fields += " mMaskMode mComposite"
%>
pub fn fill_arrays(&mut self) {
use gecko_bindings::bindings::Gecko_FillAll${shorthand.title()}Lists;
use gecko_bindings::bindings::Gecko_FillAllImageLayers;
use std::cmp;
let mut max_len = 1;
% for member in fill_fields.split():
@ -4081,7 +4081,7 @@ fn static_assert() {
unsafe {
// While we could do this manually, we'd need to also manually
// run all the copy constructors, so we just delegate to gecko
Gecko_FillAll${shorthand.title()}Lists(&mut self.gecko.${image_layers_field}, max_len);
Gecko_FillAllImageLayers(&mut self.gecko.${image_layers_field}, max_len);
}
}
</%def>