Underline Thickness is not uniform

Source/core/rendering/InlineFlowBox.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 1110 matching lines @@
     }
 
     if (paintInfo.phase == PaintPhaseMask)
         return;
 
     PaintPhase paintPhase = paintInfo.phase == PaintPhaseChildOutlines ? PaintPhaseOutline : paintInfo.phase;
     PaintInfo childInfo(paintInfo);
     childInfo.phase = paintPhase;
     childInfo.updatePaintingRootForChildren(&renderer());
 
-    // Paint our children.
+    float underlineThickness = 0;

[andersr, 2014/03/19 13:18:12]

It should probably be called decorationThickness, as it does not just apply to
underline decorations.

[h.joshi, 2014/03/19 13:59:54]

Will make required changes.

On 2014/03/19 13:18:12, rude wrote:

+    float finalThickness = 0;
+    TextDecorationStyle style = TextDecorationStyleNone;

[andersr, 2014/03/19 13:18:12]

Is TextDecorationStyle used for anything?

[h.joshi, 2014/03/19 13:59:54]

It is not used for now, but added for future reference.

On 2014/03/19 13:18:12, rude wrote:

[andersr, 2014/03/19 14:39:44]

I'm not sure it's wise to add things just because they may potentially become
relevant later.

Besides, it's wrong to return a single TextDecorationStyle. A text node may have
any number of decorations, and therefore styles (though in our implementation we
are currently limited to three).

I suggest that you collect the decoration thickness *only*, and don't bother
with the TextDecorationStyle at all. (In which case getPaintDecorationStyle
should probably be renamed to getPaintDecorationThickness).

+
+    // Paint our childrens and calculate underline thickness
     if (paintPhase != PaintPhaseSelfOutline) {
         for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
-            if (curr->renderer().isText() || !curr->boxModelObject()->hasSelfPaintingLayer())
+            if (curr->renderer().isText() || !curr->boxModelObject()->hasSelfPaintingLayer()) {
                 curr->paint(childInfo, paintOffset, lineTop, lineBottom);
+                curr->getPaintDecorationSyle(childInfo, paintOffset, &underlineThickness, &style);
+                if (finalThickness < underlineThickness)
+                    finalThickness = underlineThickness;
+            }
+        }
+
+        // We have underline thickness now, let draw it
+        for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
+            if (curr->renderer().isText() || !curr->boxModelObject()->hasSelfPaintingLayer()) {
+                curr->paintDecorationStyle(childInfo, paintOffset, lineTop, lineBottom, finalThickness);
+            }
         }
     }
 }
 
+void InlineFlowBox::paintDecorationStyle(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom)
+{
+    return;
+}
+
+void InlineFlowBox::getPaintDecorationSyle(PaintInfo& paintInfo, const LayoutPoint& paintOffset, float * underlineThickness, TextDecorationStyle * style)
+{
+    return;
+}
+
 void InlineFlowBox::paintFillLayers(const PaintInfo& paintInfo, const Color& c, const FillLayer* fillLayer, const LayoutRect& rect, CompositeOperator op)
 {
     if (!fillLayer)
         return;
     paintFillLayers(paintInfo, c, fillLayer->next(), rect, op);
     paintFillLayer(paintInfo, c, fillLayer, rect, op);
 }
 
 bool InlineFlowBox::boxShadowCanBeAppliedToBackground(const FillLayer& lastBackgroundLayer) const
 {
@@ skipping 488 matching lines @@
         ASSERT(child->prevOnLine() == prev);
         prev = child;
     }
     ASSERT(prev == m_lastChild);
 #endif
 }
 
 #endif
 
 } // namespace WebCore