Bug 1180417 - Part 2: Fix failure in layout/base/crashtests/942690.html. r=smontagu a=ritu
authorTed Clancy <tclancy@mozilla.com>
Fri, 17 Jul 2015 18:29:28 -0300
changeset 269204 b471fe2fa70173d984fbd3f6fa16c91441ebadf8
parent 269203 d9ea08608e05ea72f8407ab20134bec94de6fb8c
child 269205 aa576e40d2ae04174da1f363b464339c5d884362
push id4943
push userkwierso@gmail.com
push dateTue, 11 Aug 2015 18:01:41 +0000
treeherdermozilla-esr52@5440624ee3a8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmontagu, ritu
bugs1180417, 942690
milestone41.0
Bug 1180417 - Part 2: Fix failure in layout/base/crashtests/942690.html. r=smontagu a=ritu
layout/generic/nsTextFrame.cpp
--- a/layout/generic/nsTextFrame.cpp
+++ b/layout/generic/nsTextFrame.cpp
@@ -614,17 +614,17 @@ int32_t nsTextFrame::GetContentEnd() con
 struct FlowLengthProperty {
   int32_t mStartOffset;
   // The offset of the next fixed continuation after mStartOffset, or
   // of the end of the text if there is none
   int32_t mEndFlowOffset;
 };
 
 int32_t nsTextFrame::GetInFlowContentLength() {
-  if (!(mState & NS_FRAME_IS_BIDI)) {
+  if (!PresContext()->BidiEnabled()) {
     return mContent->TextLength() - mContentOffset;
   }
 
   FlowLengthProperty* flowLength =
     static_cast<FlowLengthProperty*>(mContent->GetProperty(nsGkAtoms::flowlength));
 
   /**
    * This frame must start inside the cached flow. If the flow starts at