[patch] Fix from upstream commit

fix_cbindgen.patch (text/plain), 2.06 KB, created by Siuchung Cheung (Clement) on 2019-12-18 06:09:57 UTC

# HG changeset patch
# User Emilio Cobos Álvarez <[e-mail]>
# Date 0 0
# Node ID 4b7a8631178fb947060cbe269ab09a001a3d8841
# Parent  862f48c753338ad89b600e2c4de9e76f650717dd
Bug 1602358 - Fix older builds with newer cbindgen. r=jwatt, a=jcristau

This should be fine to uplift so that downstream doesn't need multiple cbindgen
versions.

Differential Revision: https://phabricator.services.mozilla.com/D56346

diff --git a/layout/generic/WritingModes.h b/layout/generic/WritingModes.h
--- a/layout/generic/WritingModes.h
+++ b/layout/generic/WritingModes.h
@@ -534,17 +534,18 @@ class WritingMode {
    * the rtl-ness doesn't match), then we correct the direction by flipping the
    * same bits that get flipped in the constructor's CSS 'direction'-based
    * chunk.
    *
    * XXX change uint8_t to UBiDiLevel after bug 924851
    */
   void SetDirectionFromBidiLevel(uint8_t level) {
     if (IS_LEVEL_RTL(level) == IsBidiLTR()) {
-      mWritingMode ^= StyleWritingMode_RTL | StyleWritingMode_INLINE_REVERSED;
+      mWritingMode.bits ^= static_cast<uint8_t>(
+          (StyleWritingMode_RTL | StyleWritingMode_INLINE_REVERSED).bits);
     }
   }
 
   /**
    * Compare two WritingModes for equality.
    */
   bool operator==(const WritingMode& aOther) const {
     return mWritingMode == aOther.mWritingMode;
diff --git a/servo/ports/geckolib/cbindgen.toml b/servo/ports/geckolib/cbindgen.toml
--- a/servo/ports/geckolib/cbindgen.toml
+++ b/servo/ports/geckolib/cbindgen.toml
@@ -617,17 +617,8 @@ renaming_overrides_prefixing = true
   inline Span<const StyleGenericTrackListValue<L, I>> TrackListValues() const;
 """
 
 "GenericClipRect" = """
   // Get the layout rect, replacing auto right / bottom values for aAutoSize.
   inline nsRect ToLayoutRect(nscoord aAutoSize = NS_MAXSIZE) const;
 """
 
-"WritingMode" = """
-  StyleWritingMode operator^(const StyleWritingMode& other) const {
-    return {static_cast<decltype(bits)>(this->bits ^ other.bits)};
-  }
-  StyleWritingMode& operator^=(const StyleWritingMode& other) {
-    *this = (*this ^ other);
-    return *this;
-  }
-"""