Backed out 3 changesets (bug 1719546) for causing SM bustages at Bidi.h. CLOSED TREE
Backed out changeset c4d6ffc7e445 (bug 1719546) Backed out changeset a1f7ed6c4251 (bug 1719546) Backed out changeset e69fc596f2c3 (bug 1719546)
This commit is contained in:
@@ -69,7 +69,6 @@
|
||||
#include "nsContentUtils.h"
|
||||
#include "nsLineBreaker.h"
|
||||
#include "nsIFrameInlines.h"
|
||||
#include "mozilla/intl/Bidi.h"
|
||||
#include "mozilla/intl/WordBreaker.h"
|
||||
#include "mozilla/ServoStyleSet.h"
|
||||
|
||||
@@ -1936,7 +1935,7 @@ bool BuildTextRunsScanner::ContinueTextRunAcrossFrames(nsTextFrame* aFrame1,
|
||||
Side side2 = wm.PhysicalSide(eLogicalSideIStart);
|
||||
// If the frames have an embedding level that is opposite to the writing
|
||||
// mode, we need to swap which sides we're checking.
|
||||
if (aFrame1->GetEmbeddingLevel().IsRTL() == wm.IsBidiLTR()) {
|
||||
if (IS_LEVEL_RTL(aFrame1->GetEmbeddingLevel()) == wm.IsBidiLTR()) {
|
||||
std::swap(side1, side2);
|
||||
}
|
||||
|
||||
@@ -2397,7 +2396,7 @@ already_AddRefed<gfxTextRun> BuildTextRunsScanner::BuildTextRunForFrames(
|
||||
if (flags2 & nsTextFrameUtils::Flags::HasShy) {
|
||||
flags |= gfx::ShapedTextFlags::TEXT_ENABLE_HYPHEN_BREAKS;
|
||||
}
|
||||
if (mBidiEnabled && (firstFrame->GetEmbeddingLevel().IsRTL())) {
|
||||
if (mBidiEnabled && (IS_LEVEL_RTL(firstFrame->GetEmbeddingLevel()))) {
|
||||
flags |= gfx::ShapedTextFlags::TEXT_IS_RTL;
|
||||
}
|
||||
if (mNextRunContextInfo & nsTextFrameUtils::INCOMING_WHITESPACE) {
|
||||
|
||||
Reference in New Issue
Block a user