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

Auto merge of #15675 - Manishearth:resync, r=mbrubeck

Browse source 
Resync bindings, use StyleShapeSource for clip-path

The bindings are getting harder to rebase over since the checked-in bindings differ from the generated ones.

Also includes https://bugzilla.mozilla.org/show_bug.cgi?id=1339314

<!-- 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/15675)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-02-21 10:05:01 -08:00 • committed by GitHub
commit ed731c80d7
5 changed files with 2043 additions and 1263 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/build_gecko.rs
View file

@ -392,8 +392,8 @@ mod bindings {
"StyleAnimation", "StyleAnimation",
"StyleBasicShape", "StyleBasicShape",
"StyleBasicShapeType", "StyleBasicShapeType",
"StyleClipPath",
"StyleGeometryBox", "StyleGeometryBox",
"StyleShapeSource",
"StyleTransition", "StyleTransition",
"mozilla::UniquePtr", "mozilla::UniquePtr",
"mozilla::DefaultDelete", "mozilla::DefaultDelete",
@ -532,7 +532,7 @@ mod bindings {
"SheetParsingMode", "SheetParsingMode",
"StyleBasicShape", "StyleBasicShape",
"StyleBasicShapeType", "StyleBasicShapeType",
"StyleClipPath", "StyleShapeSource",
"nsCSSKeyword", "nsCSSKeyword",
"nsCSSPropertyID", "nsCSSPropertyID",
"nsCSSShadowArray", "nsCSSShadowArray",

16
components/style/gecko_bindings/bindings.rs
View file

@ -26,7 +26,7 @@ use gecko_bindings::structs::ServoElementSnapshot;
use gecko_bindings::structs::SheetParsingMode; use gecko_bindings::structs::SheetParsingMode;
use gecko_bindings::structs::StyleBasicShape; use gecko_bindings::structs::StyleBasicShape;
use gecko_bindings::structs::StyleBasicShapeType; use gecko_bindings::structs::StyleBasicShapeType;
use gecko_bindings::structs::StyleClipPath; use gecko_bindings::structs::StyleShapeSource;
use gecko_bindings::structs::nsCSSKeyword; use gecko_bindings::structs::nsCSSKeyword;
use gecko_bindings::structs::nsCSSPropertyID; use gecko_bindings::structs::nsCSSPropertyID;
use gecko_bindings::structs::nsCSSShadowArray; use gecko_bindings::structs::nsCSSShadowArray;
@ -691,18 +691,18 @@ extern "C" {
calc: nsStyleCoord_CalcValue); calc: nsStyleCoord_CalcValue);
} }
extern "C" { extern "C" {
pub fn Gecko_CopyClipPathValueFrom(dst: *mut StyleClipPath, pub fn Gecko_CopyClipPathValueFrom(dst: *mut StyleShapeSource,
src: *const StyleClipPath); src: *const StyleShapeSource);
} }
extern "C" { extern "C" {
pub fn Gecko_DestroyClipPath(clip: *mut StyleClipPath); pub fn Gecko_DestroyClipPath(clip: *mut StyleShapeSource);
} }
extern "C" { extern "C" {
pub fn Gecko_NewBasicShape(type_: StyleBasicShapeType) pub fn Gecko_NewBasicShape(type_: StyleBasicShapeType)
-> *mut StyleBasicShape; -> *mut StyleBasicShape;
} }
extern "C" { extern "C" {
pub fn Gecko_StyleClipPath_SetURLValue(clip: *mut StyleClipPath, pub fn Gecko_StyleClipPath_SetURLValue(clip: *mut StyleShapeSource,
uri: ServoBundledURI); uri: ServoBundledURI);
} }
extern "C" { extern "C" {
@ -1345,7 +1345,8 @@ extern "C" {
buffer: *mut nsAString_internal); buffer: *mut nsAString_internal);
} }
extern "C" { extern "C" {
pub fn Servo_AnimationValue_GetOpacity(value: RawServoAnimationValueBorrowed) pub fn Servo_AnimationValue_GetOpacity(value:
RawServoAnimationValueBorrowed)
-> f32; -> f32;
} }
extern "C" { extern "C" {
@ -1571,7 +1572,8 @@ extern "C" {
extern "C" { extern "C" {
pub fn Servo_TraverseSubtree(root: RawGeckoElementBorrowed, pub fn Servo_TraverseSubtree(root: RawGeckoElementBorrowed,
set: RawServoStyleSetBorrowed, set: RawServoStyleSetBorrowed,
root_behavior: TraversalRootBehavior) -> bool; root_behavior: TraversalRootBehavior)
-> bool;
} }
extern "C" { extern "C" {
pub fn Servo_AssertTreeIsClean(root: RawGeckoElementBorrowed); pub fn Servo_AssertTreeIsClean(root: RawGeckoElementBorrowed);

1840
components/style/gecko_bindings/structs_debug.rs
View file

File diff suppressed because it is too large Load diff

1442
components/style/gecko_bindings/structs_release.rs
View file

File diff suppressed because it is too large Load diff

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

@ -2792,7 +2792,7 @@ clip-path
use gecko_bindings::bindings::{Gecko_NewBasicShape, Gecko_DestroyClipPath}; use gecko_bindings::bindings::{Gecko_NewBasicShape, Gecko_DestroyClipPath};
use gecko_bindings::structs::StyleGeometryBox; use gecko_bindings::structs::StyleGeometryBox;
use gecko_bindings::structs::{StyleBasicShape, StyleBasicShapeType, StyleShapeSourceType}; use gecko_bindings::structs::{StyleBasicShape, StyleBasicShapeType, StyleShapeSourceType};
use gecko_bindings::structs::{StyleClipPath, StyleFillRule}; use gecko_bindings::structs::{StyleFillRule, StyleShapeSource};
use gecko::conversions::basic_shape::set_corners_from_radius; use gecko::conversions::basic_shape::set_corners_from_radius;
use gecko::values::GeckoStyleCoordConvertible; use gecko::values::GeckoStyleCoordConvertible;
use values::computed::basic_shape::*; use values::computed::basic_shape::*;
@ -2820,7 +2820,7 @@ clip-path
.unwrap_or(StyleGeometryBox::NoBox); .unwrap_or(StyleGeometryBox::NoBox);
clip_path.mType = StyleShapeSourceType::Shape; clip_path.mType = StyleShapeSourceType::Shape;
fn init_shape(clip_path: &mut StyleClipPath, ty: StyleBasicShapeType) -> &mut StyleBasicShape { fn init_shape(clip_path: &mut StyleShapeSource, ty: StyleBasicShapeType) -> &mut StyleBasicShape {
unsafe { unsafe {
// We have to be very careful to avoid a copy here! // We have to be very careful to avoid a copy here!
let ref mut union = clip_path.__bindgen_anon_1; let ref mut union = clip_path.__bindgen_anon_1;