Bug 1235489 - Remove assertion which is breakable when reflow is interrupted. draft
authorXidorn Quan <quanxunzhen@gmail.com>
Tue, 29 Dec 2015 21:41:35 +1100
changeset 317846 0cd7b22e36e3063bbd06172d49395edf17af7b9e
parent 317845 e676f8cc5afcda4e9c58192579a9d24ea55f64ef
child 512367 5d84886ad9fa160450d9a2e51668d994b61b80fa
push id8772
push userxquan@mozilla.com
push dateTue, 29 Dec 2015 10:41:48 +0000
bugs1235489
milestone46.0a1
Bug 1235489 - Remove assertion which is breakable when reflow is interrupted.
layout/generic/nsTextFrame.cpp
--- a/layout/generic/nsTextFrame.cpp
+++ b/layout/generic/nsTextFrame.cpp
@@ -6199,17 +6199,16 @@ nsTextFrame::DrawEmphasisMarks(gfxContex
                                const gfxPoint& aTextBaselinePt,
                                uint32_t aOffset, uint32_t aLength,
                                const nscolor* aDecorationOverrideColor,
                                PropertyProvider& aProvider)
 {
   auto info = static_cast<const EmphasisMarkInfo*>(
     Properties().Get(EmphasisMarkProperty()));
   if (!info) {
-    MOZ_ASSERT(!StyleText()->HasTextEmphasis());
     return;
   }
 
   nscolor color = aDecorationOverrideColor ? *aDecorationOverrideColor :
     nsLayoutUtils::GetColor(this, eCSSProperty_text_emphasis_color);
   aContext->SetColor(Color::FromABGR(color));
   gfxPoint pt(aTextBaselinePt);
   if (!aWM.IsVertical()) {