mirror of
https://github.com/servo/servo.git
synced 2025-08-10 16:05:43 +01:00
Auto merge of #15675 - Manishearth:resync, r=mbrubeck
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:
commit
ed731c80d7
5 changed files with 2043 additions and 1263 deletions
|
@ -2792,7 +2792,7 @@ clip-path
|
|||
use gecko_bindings::bindings::{Gecko_NewBasicShape, Gecko_DestroyClipPath};
|
||||
use gecko_bindings::structs::StyleGeometryBox;
|
||||
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::values::GeckoStyleCoordConvertible;
|
||||
use values::computed::basic_shape::*;
|
||||
|
@ -2820,7 +2820,7 @@ clip-path
|
|||
.unwrap_or(StyleGeometryBox::NoBox);
|
||||
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 {
|
||||
// We have to be very careful to avoid a copy here!
|
||||
let ref mut union = clip_path.__bindgen_anon_1;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue