Bug 1261578 - Part 4. Correct text overflow color; r=jfkthame
authorCJKu <cku@mozilla.com>
Tue, 19 Apr 2016 17:10:17 +0800
changeset 331738 4ec793ac0a38fa86bb8fb826534e0632063c9144
parent 331737 2fc5f3fc9d70bb000a83bcf7c5b33900f08bd7c7
child 331739 a6a3af62e8f94a5f2391cd4308b7a61b8f713b55
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjfkthame
bugs1261578
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1261578 - Part 4. Correct text overflow color; r=jfkthame MozReview-Commit-ID: 2zbmsHxb6II
layout/generic/TextOverflow.cpp
--- a/layout/generic/TextOverflow.cpp
+++ b/layout/generic/TextOverflow.cpp
@@ -209,18 +209,18 @@ PaintTextShadowCallback(nsRenderingConte
   reinterpret_cast<nsDisplayTextOverflowMarker*>(aData)->
            PaintTextToContext(aCtx, aShadowOffset);
 }
 
 void
 nsDisplayTextOverflowMarker::Paint(nsDisplayListBuilder* aBuilder,
                                    nsRenderingContext*   aCtx)
 {
-  nscolor foregroundColor =
-    nsLayoutUtils::GetColor(mFrame, eCSSProperty_color);
+  nsCSSProperty colorProp = mFrame->StyleContext()->GetTextFillColorProp();
+  nscolor foregroundColor = nsLayoutUtils::GetColor(mFrame, colorProp);
 
   // Paint the text-shadows for the overflow marker
   nsLayoutUtils::PaintTextShadow(mFrame, aCtx, mRect, mVisibleRect,
                                  foregroundColor, PaintTextShadowCallback,
                                  (void*)this);
   aCtx->ThebesContext()->SetColor(gfx::Color::FromABGR(foregroundColor));
   PaintTextToContext(aCtx, nsPoint(0, 0));
 }