Commit bdee7592 authored by Kartikaya Gupta's avatar Kartikaya Gupta
Browse files

Bug 1385003 - Autogenerated changes to go with webrender update. r=jrmuizel 

This regenerates the cargo lockfiles and FFI bindings header. It also revendors
the third_party/rust libraries.

MozReview-Commit-ID: ID0YhoIH6cz

--HG--
extra : rebase_source : 7c22828a831eafcf527f2c3baf8d4d012db8f9a4
parent 162dcae6

gfx/webrender_bindings/webrender_ffi_generated.h

+49 −38
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * License, v. 2.0. If a copy of the MPL was not distributed with this

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



/* Generated with cbindgen:0.1.19 */

/* Generated with cbindgen:0.1.20 */



/* DO NOT MODIFY THIS MANUALLY! This file was generated using cbindgen.

 * To generate this file:
@@ -144,9 +144,9 @@ enum class YuvColorSpace : uint32_t { 


struct Arc_VecU8;



struct LayerPixel;

struct DocumentHandle;



struct RenderApi;

struct LayerPixel;



struct Renderer;
@@ -255,8 +255,10 @@ struct Epoch { 


typedef Epoch WrEpoch;



typedef uint32_t PipelineSourceId;



struct PipelineId {

  uint32_t mNamespace;

  PipelineSourceId mNamespace;

  uint32_t mHandle;



  bool operator==(const PipelineId& aOther) const {
@@ -285,11 +287,13 @@ struct BuiltDisplayListDescriptor { 
  uint64_t builder_start_time;

  uint64_t builder_finish_time;

  uint64_t send_start_time;

  size_t glyph_offset;



  bool operator==(const BuiltDisplayListDescriptor& aOther) const {

    return builder_start_time == aOther.builder_start_time &&

           builder_finish_time == aOther.builder_finish_time &&

           send_start_time == aOther.send_start_time;

           send_start_time == aOther.send_start_time &&

           glyph_offset == aOther.glyph_offset;

  }

};
@@ -454,13 +458,13 @@ struct GradientStop { 
  }

};



struct SideOffsets2D_f32 {

  float top;

  float right;

  float bottom;

  float left;

struct SideOffsets2D_u32 {

  uint32_t top;

  uint32_t right;

  uint32_t bottom;

  uint32_t left;



  bool operator==(const SideOffsets2D_f32& aOther) const {

  bool operator==(const SideOffsets2D_u32& aOther) const {

    return top == aOther.top &&

           right == aOther.right &&

           bottom == aOther.bottom &&
@@ -468,13 +472,13 @@ struct SideOffsets2D_f32 { 
  }

};



struct SideOffsets2D_u32 {

  uint32_t top;

  uint32_t right;

  uint32_t bottom;

  uint32_t left;

struct SideOffsets2D_f32 {

  float top;

  float right;

  float bottom;

  float left;



  bool operator==(const SideOffsets2D_u32& aOther) const {

  bool operator==(const SideOffsets2D_f32& aOther) const {

    return top == aOther.top &&

           right == aOther.right &&

           bottom == aOther.bottom &&
@@ -540,8 +544,10 @@ struct WrFilterOp { 
  }

};



typedef uint32_t GlyphIndex;



struct GlyphInstance {

  uint32_t index;

  GlyphIndex index;

  LayoutPoint point;



  bool operator==(const GlyphInstance& aOther) const {
@@ -626,14 +632,14 @@ const VecU8 *wr_add_ref_arc(const ArcVecU8 *aArc) 
WR_FUNC;



WR_INLINE

void wr_api_add_blob_image(RenderApi *aApi,

void wr_api_add_blob_image(DocumentHandle *aDh,

                           WrImageKey aImageKey,

                           const WrImageDescriptor *aDescriptor,

                           ByteSlice aBytes)

WR_FUNC;



WR_INLINE

void wr_api_add_external_image(RenderApi *aApi,

void wr_api_add_external_image(DocumentHandle *aDh,

                               WrImageKey aImageKey,

                               const WrImageDescriptor *aDescriptor,

                               WrExternalImageId aExternalImageId,
@@ -642,14 +648,14 @@ void wr_api_add_external_image(RenderApi *aApi, 
WR_FUNC;



WR_INLINE

void wr_api_add_image(RenderApi *aApi,

void wr_api_add_image(DocumentHandle *aDh,

                      WrImageKey aImageKey,

                      const WrImageDescriptor *aDescriptor,

                      ByteSlice aBytes)

WR_FUNC;



WR_INLINE

void wr_api_add_raw_font(RenderApi *aApi,

void wr_api_add_raw_font(DocumentHandle *aDh,

                         WrFontKey aKey,

                         uint8_t *aFontBuffer,

                         size_t aBufferSize,
@@ -657,22 +663,27 @@ void wr_api_add_raw_font(RenderApi *aApi, 
WR_FUNC;



WR_INLINE

void wr_api_clear_root_display_list(RenderApi *aApi,

void wr_api_clear_root_display_list(DocumentHandle *aDh,

                                    WrEpoch aEpoch,

                                    WrPipelineId aPipelineId)

WR_FUNC;



WR_INLINE

void wr_api_delete(RenderApi *aApi)

void wr_api_clone(DocumentHandle *aDh,

                  DocumentHandle **aOutHandle)

WR_FUNC;



WR_INLINE

void wr_api_delete(DocumentHandle *aDh)

WR_DESTRUCTOR_SAFE_FUNC;



WR_INLINE

void wr_api_delete_font(RenderApi *aApi,

void wr_api_delete_font(DocumentHandle *aDh,

                        WrFontKey aKey)

WR_FUNC;



WR_INLINE

void wr_api_delete_image(RenderApi *aApi,

void wr_api_delete_image(DocumentHandle *aDh,

                         WrImageKey aKey)

WR_FUNC;
@@ -684,11 +695,11 @@ void wr_api_finalize_builder(WrState *aState, 
WR_FUNC;



WR_INLINE

void wr_api_generate_frame(RenderApi *aApi)

void wr_api_generate_frame(DocumentHandle *aDh)

WR_FUNC;



WR_INLINE

void wr_api_generate_frame_with_properties(RenderApi *aApi,

void wr_api_generate_frame_with_properties(DocumentHandle *aDh,

                                           const WrOpacityProperty *aOpacityArray,

                                           size_t aOpacityCount,

                                           const WrTransformProperty *aTransformArray,
@@ -696,16 +707,16 @@ void wr_api_generate_frame_with_properties(RenderApi *aApi, 
WR_FUNC;



WR_INLINE

WrIdNamespace wr_api_get_namespace(RenderApi *aApi)

WrIdNamespace wr_api_get_namespace(DocumentHandle *aDh)

WR_FUNC;



WR_INLINE

void wr_api_send_external_event(RenderApi *aApi,

void wr_api_send_external_event(DocumentHandle *aDh,

                                size_t aEvt)

WR_DESTRUCTOR_SAFE_FUNC;



WR_INLINE

void wr_api_set_root_display_list(RenderApi *aApi,

void wr_api_set_root_display_list(DocumentHandle *aDh,

                                  ColorF aColor,

                                  WrEpoch aEpoch,

                                  float aViewportWidth,
@@ -718,25 +729,25 @@ void wr_api_set_root_display_list(RenderApi *aApi, 
WR_FUNC;



WR_INLINE

void wr_api_set_root_pipeline(RenderApi *aApi,

void wr_api_set_root_pipeline(DocumentHandle *aDh,

                              WrPipelineId aPipelineId)

WR_FUNC;



WR_INLINE

void wr_api_set_window_parameters(RenderApi *aApi,

void wr_api_set_window_parameters(DocumentHandle *aDh,

                                  int32_t aWidth,

                                  int32_t aHeight)

WR_FUNC;



WR_INLINE

void wr_api_update_blob_image(RenderApi *aApi,

void wr_api_update_blob_image(DocumentHandle *aDh,

                              WrImageKey aImageKey,

                              const WrImageDescriptor *aDescriptor,

                              ByteSlice aBytes)

WR_FUNC;



WR_INLINE

void wr_api_update_external_image(RenderApi *aApi,

void wr_api_update_external_image(DocumentHandle *aDh,

                                  WrImageKey aKey,

                                  const WrImageDescriptor *aDescriptor,

                                  WrExternalImageId aExternalImageId,
@@ -745,7 +756,7 @@ void wr_api_update_external_image(RenderApi *aApi, 
WR_FUNC;



WR_INLINE

void wr_api_update_image(RenderApi *aApi,

void wr_api_update_image(DocumentHandle *aDh,

                         WrImageKey aKey,

                         const WrImageDescriptor *aDescriptor,

                         ByteSlice aBytes)
@@ -1026,7 +1037,7 @@ void wr_renderer_update(Renderer *aRenderer) 
WR_FUNC;



WR_INLINE

void wr_scroll_layer_with_id(RenderApi *aApi,

void wr_scroll_layer_with_id(DocumentHandle *aDh,

                             WrPipelineId aPipelineId,

                             uint64_t aScrollId,

                             LayoutPoint aNewScrollOrigin)
@@ -1060,7 +1071,7 @@ bool wr_window_new(WrWindowId aWindowId, 
                   void *aGlContext,

                   WrThreadPool *aThreadPool,

                   bool aEnableProfiler,

                   RenderApi **aOutApi,

                   DocumentHandle **aOutHandle,

                   Renderer **aOutRenderer)

WR_FUNC;

third_party/rust/freetype/.cargo-checksum.json

+1 −1
Original line number Diff line number Diff line 
{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",".travis.yml":"b66e958a27e280a79ae1742be91e02cbaf7392851d430f19b13f3619861860e2","COPYRIGHT":"ec82b96487e9e778ee610c7ab245162464782cfa1f555c2299333f8dbe5c036a","Cargo.toml":"7d09decba6c94743746eb13ebd51735356ec6a1125d33da708d3e141148c81c3","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","Makefile.in":"7348b5f8a577048279b3f98e2c2b5705f506cf5b4b1e6bb542cc0b1e62468411","README.md":"755e885eb12f7b0b459c8b579f20cd941e55f0197b947591131daf048c5d7bc6","configure":"e0e6ba778e5f5784fa87abf235aa4f3da750d922bfb26a34803d9674577d56ec","etc/bindgen.sh":"116938e8c7a4500e056f719c66bdc896739c8b0a34a16e6a29a9e335f7458648","etc/bindings.h":"f6110c7a692e24f9c6d1c4a78ba8a7750952b397b86a5ac466353c7c57cfb7bb","src/freetype.rs":"0e27e13cca4f79569718fa4c247b8f7020388d8a84ad5f971c376a0658073cfa","src/lib.rs":"812e79af46e33a93420c8301ad95392f5e8a57266b3e43c47085c6dd0c63653f","src/tt_os2.rs":"9517c53fc4e575ceb615d554dc72812dcbb532bf94883d51202b24caae1a1418"},"package":"fde23272c687e4570aefec06cb71174ec0f5284b725deac4e77ba2665d635faf"}
 
 No newline at end of file
 
{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",".travis.yml":"b66e958a27e280a79ae1742be91e02cbaf7392851d430f19b13f3619861860e2","COPYRIGHT":"ec82b96487e9e778ee610c7ab245162464782cfa1f555c2299333f8dbe5c036a","Cargo.toml":"ec1a0a3ceb37de795193e244fb3781cf87d25ea610f150976958468881da76a7","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","Makefile.in":"7348b5f8a577048279b3f98e2c2b5705f506cf5b4b1e6bb542cc0b1e62468411","README.md":"755e885eb12f7b0b459c8b579f20cd941e55f0197b947591131daf048c5d7bc6","configure":"e0e6ba778e5f5784fa87abf235aa4f3da750d922bfb26a34803d9674577d56ec","etc/bindgen.sh":"39c1d5298f6e46380f0616d6080bd2c3ead5f04149bcf5b7345c56dae2000e79","etc/bindings.h":"b531980f5739536dfc1484236d436efd18f448b4ea15001d1dfbbaf381ad054f","src/freetype.rs":"445a3d48974dcf22961b612ef6cdef48c2dedc1ccc6e73a88eee53fa601859d8","src/lib.rs":"812e79af46e33a93420c8301ad95392f5e8a57266b3e43c47085c6dd0c63653f","src/tt_os2.rs":"9517c53fc4e575ceb615d554dc72812dcbb532bf94883d51202b24caae1a1418"},"package":"398b8a11884898184d55aca9806f002b3cf68f0e860e0cbb4586f834ee39b0e7"}
 
 No newline at end of file

third_party/rust/freetype/Cargo.toml

+23 −9
Original line number Diff line number Diff line 
# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO

#

# When uploading crates to the registry Cargo will automatically

# "normalize" Cargo.toml files for maximal compatibility

# with all versions of Cargo and also rewrite `path` dependencies

# to registry (e.g. crates.io) dependencies

#

# If you believe there's an error in this file please file an

# issue against the rust-lang/cargo repository. If you're

# editing this file be aware that the upstream Cargo.toml

# will likely look very different (and much more reasonable)



[package]

description = "Bindings for Freetype used by Servo"

license = "Apache-2.0 / MIT"

name = "freetype"

version = "0.2.0"

version = "0.3.0"

authors = ["The Servo Project Developers"]

description = "Bindings for Freetype used by Servo"

documentation = "http://doc.servo.org/freetype/"

license = "Apache-2.0 / MIT"

repository = "https://github.com/servo/rust-freetype"



[features]

default = ["servo-freetype-sys"]



[lib]

name = "freetype"

crate-type = ["rlib"]

[dependencies.servo-freetype-sys]

version = "4.0.2"

optional = true



[dependencies.libc]

version = "0.2"



[dependencies]

servo-freetype-sys = { version = "4.0.2", optional = true }

libc = "0.2"
 
[features]

default = ["servo-freetype-sys"]

third_party/rust/freetype/etc/bindgen.sh

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ cd "$(dirname $0)" 
# We blacklist FT_Error and import our own in order to have convenience methods

# on it instead of being a plain integer.

"${BINDGEN}" bindings.h -o ../src/freetype.rs \

  --no-unstable-rust \

  --blacklist-type "FT_(Int16|UInt16|Int32|UInt32|Int16|Int64|UInt64)" \

  --raw-line "pub type FT_Int16 = i16;" \

  --raw-line "pub type FT_UInt16 = u16;" \

third_party/rust/freetype/etc/bindings.h

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ 
#include <freetype2/freetype/ftlcdfil.h>

#include <freetype2/freetype/tttables.h>

#include <freetype2/freetype/ftmodapi.h>

#include <freetype2/freetype/ftoutln.h>