From 8fd69b428d68f20bd3694acdaa5d5a7dbf884500 Mon Sep 17 00:00:00 2001 From: Xidorn Quan Date: Sat, 6 May 2017 12:59:55 +1000 Subject: [PATCH] Update binding files to autoland tip. --- components/style/gecko_bindings/bindings.rs | 9 ++--- .../style/gecko_bindings/structs_debug.rs | 36 ++++++++++++------- .../style/gecko_bindings/structs_release.rs | 26 ++++++++++++-- 3 files changed, 50 insertions(+), 21 deletions(-) diff --git a/components/style/gecko_bindings/bindings.rs b/components/style/gecko_bindings/bindings.rs index 1553536b706..5b030075966 100644 --- a/components/style/gecko_bindings/bindings.rs +++ b/components/style/gecko_bindings/bindings.rs @@ -1594,19 +1594,16 @@ extern "C" { extern "C" { pub fn Servo_StyleSet_AppendStyleSheet(set: RawServoStyleSetBorrowed, sheet: RawServoStyleSheetBorrowed, - unique_id: u32, - flush: bool); + unique_id: u32, flush: bool); } extern "C" { pub fn Servo_StyleSet_PrependStyleSheet(set: RawServoStyleSetBorrowed, sheet: RawServoStyleSheetBorrowed, - unique_id: u32, - flush: bool); + unique_id: u32, flush: bool); } extern "C" { pub fn Servo_StyleSet_RemoveStyleSheet(set: RawServoStyleSetBorrowed, - unique_id: u32, - flush: bool); + unique_id: u32, flush: bool); } extern "C" { pub fn Servo_StyleSet_InsertStyleSheetBefore(set: diff --git a/components/style/gecko_bindings/structs_debug.rs b/components/style/gecko_bindings/structs_debug.rs index cdb6a538892..3c8c4afa4e1 100644 --- a/components/style/gecko_bindings/structs_debug.rs +++ b/components/style/gecko_bindings/structs_debug.rs @@ -5597,15 +5597,14 @@ pub mod root { pub mNamedAreas: root::nsTArray, pub mTemplates: root::nsTArray<::nsstring::nsStringRepr>, pub mNColumns: u32, - pub mRefCnt: root::nsAutoRefCnt, - pub _mOwningThread: root::nsAutoOwningThread, + pub mRefCnt: root::mozilla::ThreadSafeAutoRefCnt, } pub type GridTemplateAreasValue_HasThreadSafeRefCnt = - root::mozilla::FalseType; + root::mozilla::TrueType; #[test] fn bindgen_test_layout_GridTemplateAreasValue() { assert_eq!(::std::mem::size_of::() , - 40usize , concat ! ( + 32usize , concat ! ( "Size of: " , stringify ! ( GridTemplateAreasValue ) )); assert_eq! (::std::mem::align_of::() , @@ -5640,13 +5639,6 @@ pub mod root { "Alignment of field: " , stringify ! ( GridTemplateAreasValue ) , "::" , stringify ! ( mRefCnt ) )); - assert_eq! (unsafe { - & ( * ( 0 as * const GridTemplateAreasValue ) ) . - _mOwningThread as * const _ as usize } , 32usize , - concat ! ( - "Alignment of field: " , stringify ! ( - GridTemplateAreasValue ) , "::" , stringify ! ( - _mOwningThread ) )); } #[repr(C)] #[derive(Debug)] @@ -16238,6 +16230,11 @@ pub mod root { } pub const nsIPresShell_FORCE_DRAW: root::nsIPresShell__bindgen_ty_5 = nsIPresShell__bindgen_ty_5::FORCE_DRAW; + pub const nsIPresShell_ADD_FOR_SUBDOC: root::nsIPresShell__bindgen_ty_5 = + nsIPresShell__bindgen_ty_5::ADD_FOR_SUBDOC; + pub const nsIPresShell_APPEND_UNSCROLLED_ONLY: + root::nsIPresShell__bindgen_ty_5 = + nsIPresShell__bindgen_ty_5::APPEND_UNSCROLLED_ONLY; #[repr(u32)] /** * Add a solid color item to the bottom of aList with frame aFrame and bounds @@ -16245,9 +16242,23 @@ pub mod root { * canvas frame (if the FORCE_DRAW flag is passed then this check is skipped). * aBackstopColor is composed behind the background color of the canvas, it is * transparent by default. + * We attempt to make the background color part of the scrolled canvas (to reduce + * transparent layers), and if async scrolling is enabled (and the background + * is opaque) then we add a second, unscrolled item to handle the checkerboarding + * case. + * ADD_FOR_SUBDOC shoud be specified when calling this for a subdocument, and + * LayoutUseContainersForRootFrame might cause the whole list to be scrolled. In + * that case the second unscrolled item will be elided. + * APPEND_UNSCROLLED_ONLY only attempts to add the unscrolled item, so that we + * can add it manually after LayoutUseContainersForRootFrame has built the + * scrolling ContainerLayer. */ #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum nsIPresShell__bindgen_ty_5 { FORCE_DRAW = 1, } + pub enum nsIPresShell__bindgen_ty_5 { + FORCE_DRAW = 1, + ADD_FOR_SUBDOC = 2, + APPEND_UNSCROLLED_ONLY = 4, + } #[repr(C)] #[derive(Debug)] pub struct nsIPresShell_PointerCaptureInfo { @@ -19034,6 +19045,7 @@ pub mod root { NS_FRAME_HAS_LAYER_ACTIVITY_PROPERTY = 18014398509481984, NS_FRAME_OWNS_ANON_BOXES = 36028797018963968, NS_FRAME_HAS_PROPERTIES = 72057594037927936, + NS_FRAME_SIMPLE_DISPLAYLIST = 144115188075855872, NS_FRAME_MATHML_SCRIPT_DESCENDANT = 288230376151711744, NS_FRAME_IS_IN_SINGLE_CHAR_MI = 576460752303423488, NS_STATE_BOX_CHILD_RESERVED = 1048576, diff --git a/components/style/gecko_bindings/structs_release.rs b/components/style/gecko_bindings/structs_release.rs index f4f43100bc4..d69c258bc05 100644 --- a/components/style/gecko_bindings/structs_release.rs +++ b/components/style/gecko_bindings/structs_release.rs @@ -5519,10 +5519,10 @@ pub mod root { pub mNamedAreas: root::nsTArray, pub mTemplates: root::nsTArray<::nsstring::nsStringRepr>, pub mNColumns: u32, - pub mRefCnt: root::nsAutoRefCnt, + pub mRefCnt: root::mozilla::ThreadSafeAutoRefCnt, } pub type GridTemplateAreasValue_HasThreadSafeRefCnt = - root::mozilla::FalseType; + root::mozilla::TrueType; #[test] fn bindgen_test_layout_GridTemplateAreasValue() { assert_eq!(::std::mem::size_of::() , @@ -15692,6 +15692,11 @@ pub mod root { } pub const nsIPresShell_FORCE_DRAW: root::nsIPresShell__bindgen_ty_5 = nsIPresShell__bindgen_ty_5::FORCE_DRAW; + pub const nsIPresShell_ADD_FOR_SUBDOC: root::nsIPresShell__bindgen_ty_5 = + nsIPresShell__bindgen_ty_5::ADD_FOR_SUBDOC; + pub const nsIPresShell_APPEND_UNSCROLLED_ONLY: + root::nsIPresShell__bindgen_ty_5 = + nsIPresShell__bindgen_ty_5::APPEND_UNSCROLLED_ONLY; #[repr(u32)] /** * Add a solid color item to the bottom of aList with frame aFrame and bounds @@ -15699,9 +15704,23 @@ pub mod root { * canvas frame (if the FORCE_DRAW flag is passed then this check is skipped). * aBackstopColor is composed behind the background color of the canvas, it is * transparent by default. + * We attempt to make the background color part of the scrolled canvas (to reduce + * transparent layers), and if async scrolling is enabled (and the background + * is opaque) then we add a second, unscrolled item to handle the checkerboarding + * case. + * ADD_FOR_SUBDOC shoud be specified when calling this for a subdocument, and + * LayoutUseContainersForRootFrame might cause the whole list to be scrolled. In + * that case the second unscrolled item will be elided. + * APPEND_UNSCROLLED_ONLY only attempts to add the unscrolled item, so that we + * can add it manually after LayoutUseContainersForRootFrame has built the + * scrolling ContainerLayer. */ #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum nsIPresShell__bindgen_ty_5 { FORCE_DRAW = 1, } + pub enum nsIPresShell__bindgen_ty_5 { + FORCE_DRAW = 1, + ADD_FOR_SUBDOC = 2, + APPEND_UNSCROLLED_ONLY = 4, + } #[repr(C)] #[derive(Debug)] pub struct nsIPresShell_PointerCaptureInfo { @@ -18462,6 +18481,7 @@ pub mod root { NS_FRAME_HAS_LAYER_ACTIVITY_PROPERTY = 18014398509481984, NS_FRAME_OWNS_ANON_BOXES = 36028797018963968, NS_FRAME_HAS_PROPERTIES = 72057594037927936, + NS_FRAME_SIMPLE_DISPLAYLIST = 144115188075855872, NS_FRAME_MATHML_SCRIPT_DESCENDANT = 288230376151711744, NS_FRAME_IS_IN_SINGLE_CHAR_MI = 576460752303423488, NS_STATE_BOX_CHILD_RESERVED = 1048576,