Bug 1322094: Fixes for Stylo's binding generation in master bindgen. r=heycam
authorEmilio Cobos Álvarez <emilio@crisal.io>
Mon, 05 Dec 2016 03:39:24 +0100
changeset 325275 fd06026aad5670d226b975a05312e1be9163a0f4
parent 325274 ef519c7016370ecf87c4c3f9a38d32f6b5936be8
child 325276 2b75ffccec23e7b00fdc84dfcf0f0530f0c0ac22
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersheycam
bugs1322094
milestone53.0a1
Bug 1322094: Fixes for Stylo's binding generation in master bindgen. r=heycam MozReview-Commit-ID: FSp9XfwX3FJ
dom/base/nsIDocument.h
layout/style/nsStyleStruct.h
--- a/dom/base/nsIDocument.h
+++ b/dom/base/nsIDocument.h
@@ -3023,28 +3023,28 @@ protected:
   RefPtr<mozilla::dom::FontFaceSet> mFontFaceSet;
 
   // Compatibility mode
   nsCompatibility mCompatMode;
 
   // Our readyState
   ReadyState mReadyState;
 
+  // Whether this document has (or will have, once we have a pres shell) a
+  // Gecko- or Servo-backed style system.
+  mozilla::StyleBackendType mStyleBackendType;
+
 #ifdef MOZILLA_INTERNAL_API
   // Our visibility state
   mozilla::dom::VisibilityState mVisibilityState;
   static_assert(sizeof(mozilla::dom::VisibilityState) == sizeof(uint32_t), "Error size of mVisibilityState and mDummy");
 #else
   uint32_t mDummy;
 #endif
 
-  // Whether this document has (or will have, once we have a pres shell) a
-  // Gecko- or Servo-backed style system.
-  mozilla::StyleBackendType mStyleBackendType;
-
   // True if BIDI is enabled.
   bool mBidiEnabled : 1;
   // True if a MathML element has ever been owned by this document.
   bool mMathMLEnabled : 1;
 
   // True if this document is the initial document for a window.  This should
   // basically be true only for documents that exist in newly-opened windows or
   // documents created to satisfy a GetDocument() on a window when there's no
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -3953,17 +3953,17 @@ struct nsSize_Simple {
   nscoord width, height;
 };
 
 STATIC_ASSERT_TYPE_LAYOUTS_MATCH(nsSize, nsSize_Simple);
 STATIC_ASSERT_FIELD_OFFSET_MATCHES(nsSize, nsSize_Simple, width);
 STATIC_ASSERT_FIELD_OFFSET_MATCHES(nsSize, nsSize_Simple, height);
 
 /**
- * <div rustbindgen="true" replaces="UniquePtr">
+ * <div rustbindgen="true" replaces="mozilla_UniquePtr">
  *
  * TODO(Emilio): This is a workaround and we should be able to get rid of this
  * one.
  */
 template<typename T, typename Deleter = mozilla::DefaultDelete<T>>
 struct UniquePtr_Simple {
   T* mPtr;
 };