servo: Merge #16314 - Include bindings for StyleGridTemplate (from Wafflespeanut:bind); r=heycam
authorRavi Shankar <wafflespeanut@gmail.com>
Sun, 09 Apr 2017 02:29:32 -0500
changeset 559346 c0aefd90ac6369eead7b5a5573060a2dc23c02e1
parent 559345 9cc544bacfd31e1004f7721ccdcc738692eec81c
child 559347 b06bd43117138b783ca95017f57e3c7dd0621311
push id53058
push userarchaeopteryx@coole-files.de
push dateSun, 09 Apr 2017 21:36:26 +0000
reviewersheycam
bugs1354775
milestone55.0a1
servo: Merge #16314 - Include bindings for StyleGridTemplate (from Wafflespeanut:bind); r=heycam Servo-side changes for [Bug 1354775](https://bugzilla.mozilla.org/show_bug.cgi?id=1354775) Source-Repo: https://github.com/servo/servo Source-Revision: 6020c2feebc14f0fadabbca73b553d05af0e365f
servo/components/style/build_gecko.rs
servo/components/style/gecko_bindings/bindings.rs
--- a/servo/components/style/build_gecko.rs
+++ b/servo/components/style/build_gecko.rs
@@ -396,16 +396,17 @@ mod bindings {
             "nsStyleCoord",
             "nsStyleCounterData",
             "nsStyleDisplay",
             "nsStyleEffects",
             "nsStyleFilter",
             "nsStyleFont",
             "nsStyleGradient",
             "nsStyleGradientStop",
+            "nsStyleGridTemplate",
             "nsStyleImage",
             "nsStyleImageLayers",
             "nsStyleList",
             "nsStyleMargin",
             "nsStyleOutline",
             "nsStylePadding",
             "nsStylePosition",
             "nsStyleSVG",
@@ -654,16 +655,17 @@ mod bindings {
             "nsStyleCoord_Calc",
             "nsStyleCoord_CalcValue",
             "nsStyleDisplay",
             "nsStyleEffects",
             "nsStyleFilter",
             "nsStyleFont",
             "nsStyleGradient",
             "nsStyleGradientStop",
+            "nsStyleGridTemplate",
             "nsStyleImage",
             "nsStyleImageLayers",
             "nsStyleImageLayers_Layer",
             "nsStyleImageLayers_LayerType",
             "nsStyleImageRequest",
             "nsStyleList",
             "nsStyleMargin",
             "nsStyleOutline",
--- a/servo/components/style/gecko_bindings/bindings.rs
+++ b/servo/components/style/gecko_bindings/bindings.rs
@@ -93,16 +93,19 @@ use gecko_bindings::structs::nsStyleFont
 unsafe impl Send for nsStyleFont {}
 unsafe impl Sync for nsStyleFont {}
 use gecko_bindings::structs::nsStyleGradient;
 unsafe impl Send for nsStyleGradient {}
 unsafe impl Sync for nsStyleGradient {}
 use gecko_bindings::structs::nsStyleGradientStop;
 unsafe impl Send for nsStyleGradientStop {}
 unsafe impl Sync for nsStyleGradientStop {}
+use gecko_bindings::structs::nsStyleGridTemplate;
+unsafe impl Send for nsStyleGridTemplate {}
+unsafe impl Sync for nsStyleGridTemplate {}
 use gecko_bindings::structs::nsStyleImage;
 unsafe impl Send for nsStyleImage {}
 unsafe impl Sync for nsStyleImage {}
 use gecko_bindings::structs::nsStyleImageLayers;
 unsafe impl Send for nsStyleImageLayers {}
 unsafe impl Sync for nsStyleImageLayers {}
 use gecko_bindings::structs::nsStyleImageLayers_Layer;
 unsafe impl Send for nsStyleImageLayers_Layer {}
@@ -775,16 +778,22 @@ extern "C" {
 extern "C" {
     pub fn Gecko_CreateElementSnapshot(element: RawGeckoElementBorrowed)
      -> ServoElementSnapshotOwned;
 }
 extern "C" {
     pub fn Gecko_DropElementSnapshot(snapshot: ServoElementSnapshotOwned);
 }
 extern "C" {
+    pub fn Gecko_CopyStyleGridTemplateValues(grid_template:
+                                                 *mut nsStyleGridTemplate,
+                                             other:
+                                                 *const nsStyleGridTemplate);
+}
+extern "C" {
     pub fn Gecko_ClearAndResizeStyleContents(content: *mut nsStyleContent,
                                              how_many: u32);
 }
 extern "C" {
     pub fn Gecko_ClearAndResizeCounterIncrements(content: *mut nsStyleContent,
                                                  how_many: u32);
 }
 extern "C" {