Attachment #599998 for bug #703260

View | Details | Raw Unified | Return to bug 703260
Collapse All | Expand All




   * 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.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;




  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;
  }
"""

Return to bug 703260

Lines 534-550 class WritingMode { Link Here

(-)a/layout/generic/WritingModes.h (-1 / +2 lines)
534	* the rtl-ness doesn't match), then we correct the direction by flipping the	534	* the rtl-ness doesn't match), then we correct the direction by flipping the
535	* same bits that get flipped in the constructor's CSS 'direction'-based	535	* same bits that get flipped in the constructor's CSS 'direction'-based
536	* chunk.	536	* chunk.
537	*	537	*
538	* XXX change uint8_t to UBiDiLevel after bug 924851	538	* XXX change uint8_t to UBiDiLevel after bug 924851
539	*/	539	*/
540	void SetDirectionFromBidiLevel(uint8_t level) {	540	void SetDirectionFromBidiLevel(uint8_t level) {
541	if (IS_LEVEL_RTL(level) == IsBidiLTR()) {	541	if (IS_LEVEL_RTL(level) == IsBidiLTR()) {
542	mWritingMode ^= StyleWritingMode_RTL \| StyleWritingMode_INLINE_REVERSED;	542	mWritingMode.bits ^= static_cast<uint8_t>(
		543	(StyleWritingMode_RTL \| StyleWritingMode_INLINE_REVERSED).bits);
543	}	544	}
544	}	545	}
545		546
546	/**	547	/**
547	* Compare two WritingModes for equality.	548	* Compare two WritingModes for equality.
548	*/	549	*/
549	bool operator==(const WritingMode& aOther) const {	550	bool operator==(const WritingMode& aOther) const {
550	return mWritingMode == aOther.mWritingMode;	551	return mWritingMode == aOther.mWritingMode;

Lines 617-633 renaming_overrides_prefixing = true Link Here

(-)a/servo/ports/geckolib/cbindgen.toml (-9 lines)
617	inline Span<const StyleGenericTrackListValue<L, I>> TrackListValues() const;	617	inline Span<const StyleGenericTrackListValue<L, I>> TrackListValues() const;
618	"""	618	"""
619		619
620	"GenericClipRect" = """	620	"GenericClipRect" = """
621	// Get the layout rect, replacing auto right / bottom values for aAutoSize.	621	// Get the layout rect, replacing auto right / bottom values for aAutoSize.
622	inline nsRect ToLayoutRect(nscoord aAutoSize = NS_MAXSIZE) const;	622	inline nsRect ToLayoutRect(nscoord aAutoSize = NS_MAXSIZE) const;
623	"""	623	"""
624		624
625	"WritingMode" = """
626	StyleWritingMode operator^(const StyleWritingMode& other) const {
627	return {static_cast<decltype(bits)>(this->bits ^ other.bits)};
628	}
629	StyleWritingMode& operator^=(const StyleWritingMode& other) {
630	this = (this ^ other);
631	return *this;
632	}
633	"""